From 1a8eb79703d626b03fcde53fbdc44c751d1f0fd8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Milo=C5=A1=20Mula=C4=8D?= Date: Tue, 26 Feb 2008 13:48:53 +0000 Subject: [PATCH] registration of subjobs working test_query_events builds --- org.glite.lb.server/src/query.c | 1 + org.glite.lb.server/src/store.c.T | 4 ++-- org.glite.lb.server/test/test_query_events.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/org.glite.lb.server/src/query.c b/org.glite.lb.server/src/query.c index 29902a6..a63da40 100644 --- a/org.glite.lb.server/src/query.c +++ b/org.glite.lb.server/src/query.c @@ -22,6 +22,7 @@ #include "store.h" #include "lb_authz.h" #include "db_supp.h" +#include "jobstat.h" #define FL_SEL_STATUS 1 #define FL_SEL_TAGS (1<<1) diff --git a/org.glite.lb.server/src/store.c.T b/org.glite.lb.server/src/store.c.T index fc15e27..f750371 100644 --- a/org.glite.lb.server/src/store.c.T +++ b/org.glite.lb.server/src/store.c.T @@ -268,7 +268,7 @@ int is_job_local(edg_wll_Context ctx, glite_jobid_const_t jobId) int store_job_server_proxy(edg_wll_Context ctx, edg_wll_Event *event, int *register_to_JP) { char *unique = edg_wlc_JobIdGetUnique(event->any.jobId); - char *q = NULL, *userid = NULL, *subj; + char *q = NULL, *userid = NULL, *subj = NULL; glite_lbu_Statement stmt = NULL; int nar, grey = 0; char *can_peername = NULL; @@ -283,7 +283,7 @@ int store_job_server_proxy(edg_wll_Context ctx, edg_wll_Event *event, int *regis return edg_wll_SetError(ctx,EPERM,"LB proxy can't store using unauthenticated connection"); - trio_asprintf(&q,"select proxy,server,grey from jobs where jobid='%|Ss' for update", event->any.jobId); + trio_asprintf(&q,"select proxy,server,grey from jobs where jobid='%|Ss' for update", unique); nar = edg_wll_ExecSQL(ctx,q,&stmt); diff --git a/org.glite.lb.server/test/test_query_events.cpp b/org.glite.lb.server/test/test_query_events.cpp index e4e39e8..1a3cd2a 100644 --- a/org.glite.lb.server/test/test_query_events.cpp +++ b/org.glite.lb.server/test/test_query_events.cpp @@ -158,7 +158,7 @@ int glite_lbu_bufferedInsertClose(glite_lbu_bufInsert bi) { return 0; } int glite_lbu_QueryIndices(glite_lbu_DBContext ctx, const char *table, char ***key_names, char ****column_names) { return 0; } int glite_lbu_DBError(glite_lbu_DBContext ctx, char **s1, char **s2) { return 0; } -int edg_wll_JobStatus( +int edg_wll_JobStatusServer( edg_wll_Context ctx, const edg_wlc_JobId job, int flags, -- 1.8.2.3