From: Miloš Mulač <mulac@civ.zcu.cz>
Date: Mon, 21 Jul 2008 11:29:22 +0000 (+0000)
Subject: fix of bug #33467
X-Git-Tag: glite-lb-client_R_3_2_2_1~11
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=67d0f24ce4672ccaebd78fd7f2003b2dda05c0da;p=jra1mw.git

fix of bug #33467
- Change ACL event should not affect state computation
---

diff --git a/org.glite.lb.server/src/process_event.c b/org.glite.lb.server/src/process_event.c
index 31aad89..03914d0 100644
--- a/org.glite.lb.server/src/process_event.c
+++ b/org.glite.lb.server/src/process_event.c
@@ -275,6 +275,7 @@ static int processEvent_glite(intJobStat *js, edg_wll_Event *e, int ev_seq, int
 				fine_res = RET_OK;
 				
 	int	lm_favour_lrms = 0;
+	int	ignore_seq_code = 0;
 
 	// Aborted may not be terminal state for collection in some cases
 	// i.e. if some Done/failed subjob is resubmitted
@@ -873,11 +874,14 @@ static int processEvent_glite(intJobStat *js, edg_wll_Event *e, int ev_seq, int
 			break;
 		case EDG_WLL_EVENT_LISTENER:
 			/* ignore, listener port is not part of job status */
-			break;
 		case EDG_WLL_EVENT_CURDESCR:
 		case EDG_WLL_EVENT_CHKPT:
+			/* these three event are probably dead relics */
+			break;
 		case EDG_WLL_EVENT_CHANGEACL:
 			/* ignore, only for event log */
+			/* seq. code of this event should not influence future state computeation */
+			ignore_seq_code = 1;
 			break;
 		case EDG_WLL_EVENT_COLLECTIONSTATE:
 			new_state = edg_wll_StringToStat(e->collectionState.state);
@@ -915,7 +919,9 @@ static int processEvent_glite(intJobStat *js, edg_wll_Event *e, int ev_seq, int
 				free(js->last_seqcode);
 				js->last_seqcode = set_component_seqcode(e->any.seqcode,EDG_WLL_SOURCE_LOG_MONITOR,0);
 			}
-			else rep(js->last_seqcode, e->any.seqcode);
+			else if (!ignore_seq_code) { 
+				rep(js->last_seqcode, e->any.seqcode); 
+			}
 		}
 
 		if (js->pub.state != EDG_WLL_JOB_RUNNING) {