From dc7407c59ba4a0ea897b8160097a85581703f84b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ji=C5=99=C3=AD=20Filipovi=C4=8D?= Date: Mon, 7 Mar 2011 18:52:27 +0000 Subject: [PATCH] embryonic registration for SB transfers collections --- org.glite.lb.server/src/db_store.c | 4 ++-- org.glite.lb.server/src/store.c.T | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.glite.lb.server/src/db_store.c b/org.glite.lb.server/src/db_store.c index 7a834a6..bb5dea8 100644 --- a/org.glite.lb.server/src/db_store.c +++ b/org.glite.lb.server/src/db_store.c @@ -132,8 +132,8 @@ db_store(edg_wll_Context ctx, char *event) if (ev->any.type == EDG_WLL_EVENT_REGJOB && (ev->regJob.jobtype == EDG_WLL_REGJOB_DAG || ev->regJob.jobtype == EDG_WLL_REGJOB_PARTITIONED || - ev->regJob.jobtype == EDG_WLL_REGJOB_COLLECTION /*|| - ev->regJob.jobtype == EDG_WLL_REGJOB_FILE_TRANSFER_COLLECTION*/) && + ev->regJob.jobtype == EDG_WLL_REGJOB_COLLECTION || + ev->regJob.jobtype == EDG_WLL_REGJOB_FILE_TRANSFER_COLLECTION) && ev->regJob.nsubjobs > 0) { if (register_subjobs_embryonic(ctx,&ev->regJob)) goto rollback; diff --git a/org.glite.lb.server/src/store.c.T b/org.glite.lb.server/src/store.c.T index bc9cd85..66a1efa 100644 --- a/org.glite.lb.server/src/store.c.T +++ b/org.glite.lb.server/src/store.c.T @@ -690,7 +690,7 @@ edg_wll_ErrorCode intJobStat_embryonic( edg_wlc_JobIdDup(e->jobId, &intJobStat_to_JobStat(stat)->parent_job)) goto err; intJobStat_to_JobStat(stat)->state = EDG_WLL_JOB_SUBMITTED; intJobStat_to_JobStat(stat)->owner = strdup(e->user); - intJobStat_to_JobStat(stat)->jobtype = EDG_WLL_STAT_SIMPLE; + intJobStat_to_JobStat(stat)->jobtype = e->jobtype; intJobStat_to_JobStat(stat)->stateEnterTimes[1 + EDG_WLL_JOB_SUBMITTED] = (int)e->timestamp.tv_sec; intJobStat_to_JobStat(stat)->lastUpdateTime = e->timestamp; intJobStat_to_JobStat(stat)->stateEnterTime = e->timestamp; -- 1.8.2.3