Skip to content

Commit e330d76

Browse files
KlausDornsbachklaus.freitas.scclouds
KlausDornsbach
and
klaus.freitas.scclouds
authored
Log4j2 refactor cloud engine orchestration module (#8742)
Co-authored-by: klaus.freitas.scclouds <klaus.freitas@scclouds.com.br>
1 parent 4fe2b66 commit e330d76

15 files changed

Lines changed: 745 additions & 1174 deletions

‎engine/orchestration/src/main/java/com/cloud/agent/manager/AgentAttache.java‎

Lines changed: 24 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ public int compare(final Object o1, final Object o2) {
105105
}
106106
};
107107

108+
protected static String LOG_SEQ_FORMATTED_STRING;
109+
108110
protected final long _id;
109111
protected String _name = null;
110112
protected final ConcurrentHashMap<Long, Listener> _waitForList;
@@ -137,6 +139,7 @@ protected AgentAttache(final AgentManagerImpl agentMgr, final long id, final Str
137139
_requests = new LinkedList<Request>();
138140
_agentMgr = agentMgr;
139141
_nextSequence = new Long(s_rand.nextInt(Short.MAX_VALUE)).longValue() << 48;
142+
LOG_SEQ_FORMATTED_STRING = String.format("Seq %d-{}: {}", _id);
140143
}
141144

142145
public synchronized long getNextSequence() {
@@ -197,9 +200,7 @@ protected void cancel(final Request req) {
197200
}
198201

199202
protected synchronized void cancel(final long seq) {
200-
if (logger.isDebugEnabled()) {
201-
logger.debug(log(seq, "Cancelling."));
202-
}
203+
logger.debug(LOG_SEQ_FORMATTED_STRING, seq, "Cancelling.");
203204
final Listener listener = _waitForList.remove(seq);
204205
if (listener != null) {
205206
listener.processDisconnect(_id, Status.Disconnected);
@@ -218,24 +219,16 @@ protected synchronized int findRequest(final long seq) {
218219
return Collections.binarySearch(_requests, seq, s_seqComparator);
219220
}
220221

221-
protected String log(final long seq, final String msg) {
222-
return "Seq " + _id + "-" + seq + ": " + msg;
223-
}
224-
225222
protected void registerListener(final long seq, final Listener listener) {
226-
if (logger.isTraceEnabled()) {
227-
logger.trace(log(seq, "Registering listener"));
228-
}
223+
logger.trace(LOG_SEQ_FORMATTED_STRING, seq, "Registering listener");
229224
if (listener.getTimeout() != -1) {
230225
s_listenerExecutor.schedule(new Alarm(seq), listener.getTimeout(), TimeUnit.SECONDS);
231226
}
232227
_waitForList.put(seq, listener);
233228
}
234229

235230
protected Listener unregisterListener(final long sequence) {
236-
if (logger.isTraceEnabled()) {
237-
logger.trace(log(sequence, "Unregistering listener"));
238-
}
231+
logger.trace(LOG_SEQ_FORMATTED_STRING, sequence, "Unregistering listener");
239232
return _waitForList.remove(sequence);
240233
}
241234

@@ -267,7 +260,7 @@ public int getNonRecurringListenersSize() {
267260
final Listener monitor = entry.getValue();
268261
if (!monitor.isRecurring()) {
269262
//TODO - remove this debug statement later
270-
logger.debug("Listener is " + entry.getValue() + " waiting on " + entry.getKey());
263+
logger.debug("Listener is {} waiting on {}", entry.getValue(), entry.getKey());
271264
nonRecurringListenersList.add(monitor);
272265
}
273266
}
@@ -290,15 +283,10 @@ public boolean processAnswers(final long seq, final Response resp) {
290283
if (answers[0] != null && answers[0].getResult()) {
291284
processed = true;
292285
}
293-
if (logger.isDebugEnabled()) {
294-
logger.debug(log(seq, "Unable to find listener."));
295-
}
286+
logger.debug(LOG_SEQ_FORMATTED_STRING, seq, "Unable to find listener.");
296287
} else {
297288
processed = monitor.processAnswers(_id, seq, answers);
298-
if (logger.isTraceEnabled()) {
299-
logger.trace(log(seq, (processed ? "" : " did not ") + " processed "));
300-
}
301-
289+
logger.trace(LOG_SEQ_FORMATTED_STRING, seq, (processed ? "" : " did not ") + " processed ");
302290
if (!monitor.isRecurring()) {
303291
unregisterListener(seq);
304292
}
@@ -324,9 +312,7 @@ protected void cancelAllCommands(final Status state, final boolean cancelActive)
324312
final Map.Entry<Long, Listener> entry = it.next();
325313
it.remove();
326314
final Listener monitor = entry.getValue();
327-
if (logger.isDebugEnabled()) {
328-
logger.debug(log(entry.getKey(), "Sending disconnect to " + monitor.getClass()));
329-
}
315+
logger.debug(LOG_SEQ_FORMATTED_STRING, entry.getKey(), "Sending disconnect to " + monitor.getClass());
330316
monitor.processDisconnect(_id, state);
331317
}
332318
}
@@ -357,9 +343,8 @@ public void send(final Request req, final Listener listener) throws AgentUnavail
357343
long seq = req.getSequence();
358344
if (listener != null) {
359345
registerListener(seq, listener);
360-
} else if (logger.isDebugEnabled()) {
361-
logger.debug(log(seq, "Routed from " + req.getManagementServerId()));
362346
}
347+
logger.debug(LOG_SEQ_FORMATTED_STRING, seq, "Routed from " + req.getManagementServerId());
363348

364349
synchronized (this) {
365350
try {
@@ -381,16 +366,14 @@ public void send(final Request req, final Listener listener) throws AgentUnavail
381366

382367
if (req.executeInSequence() && _currentSequence == null) {
383368
_currentSequence = seq;
384-
if (logger.isTraceEnabled()) {
385-
logger.trace(log(seq, " is current sequence"));
386-
}
369+
logger.trace(LOG_SEQ_FORMATTED_STRING, seq, " is current sequence");
387370
}
388371
} catch (AgentUnavailableException e) {
389-
logger.info(log(seq, "Unable to send due to " + e.getMessage()));
372+
logger.info(LOG_SEQ_FORMATTED_STRING, seq, "Unable to send due to " + e.getMessage());
390373
cancel(seq);
391374
throw e;
392375
} catch (Exception e) {
393-
logger.warn(log(seq, "Unable to send due to "), e);
376+
logger.warn(LOG_SEQ_FORMATTED_STRING, seq, "Unable to send due to " + e.getMessage(), e);
394377
cancel(seq);
395378
throw new AgentUnavailableException("Problem due to other exception " + e.getMessage(), _id);
396379
}
@@ -409,50 +392,41 @@ public Answer[] send(final Request req, final int wait) throws AgentUnavailableE
409392
try {
410393
answers = sl.waitFor(wait);
411394
} catch (final InterruptedException e) {
412-
logger.debug(log(seq, "Interrupted"));
395+
logger.debug(LOG_SEQ_FORMATTED_STRING, seq, "Interrupted");
413396
}
414397
if (answers != null) {
415-
if (logger.isDebugEnabled()) {
416-
new Response(req, answers).logD("Received: ", false);
417-
}
398+
new Response(req, answers).logD("Received: ", false);
418399
return answers;
419400
}
420401

421402
answers = sl.getAnswers(); // Try it again.
422403
if (answers != null) {
423-
if (logger.isDebugEnabled()) {
424-
new Response(req, answers).logD("Received after timeout: ", true);
425-
}
404+
new Response(req, answers).logD("Received after timeout: ", true);
426405

427406
_agentMgr.notifyAnswersToMonitors(_id, seq, answers);
428407
return answers;
429408
}
430409

431410
final Long current = _currentSequence;
432411
if (current != null && seq != current) {
433-
if (logger.isDebugEnabled()) {
434-
logger.debug(log(seq, "Waited too long."));
435-
}
412+
logger.debug(LOG_SEQ_FORMATTED_STRING, seq, "Waited too long.");
436413

437414
throw new OperationTimedoutException(req.getCommands(), _id, seq, wait, false);
438415
}
439-
440-
if (logger.isDebugEnabled()) {
441-
logger.debug(log(seq, "Waiting some more time because this is the current command"));
442-
}
416+
logger.debug(LOG_SEQ_FORMATTED_STRING, seq, "Waiting some more time because this is the current command");
443417
}
444418

445419
throw new OperationTimedoutException(req.getCommands(), _id, seq, wait * 2, true);
446420
} catch (OperationTimedoutException e) {
447-
logger.warn(log(seq, "Timed out on " + req.toString()));
421+
logger.warn(LOG_SEQ_FORMATTED_STRING, seq, "Timed out on " + req.toString());
448422
cancel(seq);
449423
final Long current = _currentSequence;
450424
if (req.executeInSequence() && (current != null && current == seq)) {
451425
sendNext(seq);
452426
}
453427
throw e;
454428
} catch (Exception e) {
455-
logger.warn(log(seq, "Exception while waiting for answer"), e);
429+
logger.warn(LOG_SEQ_FORMATTED_STRING, seq, "Exception while waiting for answer", e);
456430
cancel(seq);
457431
final Long current = _currentSequence;
458432
if (req.executeInSequence() && (current != null && current == seq)) {
@@ -467,22 +441,16 @@ public Answer[] send(final Request req, final int wait) throws AgentUnavailableE
467441
protected synchronized void sendNext(final long seq) {
468442
_currentSequence = null;
469443
if (_requests.isEmpty()) {
470-
if (logger.isDebugEnabled()) {
471-
logger.debug(log(seq, "No more commands found"));
472-
}
444+
logger.debug(LOG_SEQ_FORMATTED_STRING, seq, "No more commands found");
473445
return;
474446
}
475447

476448
Request req = _requests.pop();
477-
if (logger.isDebugEnabled()) {
478-
logger.debug(log(req.getSequence(), "Sending now. is current sequence."));
479-
}
449+
logger.debug(LOG_SEQ_FORMATTED_STRING, req.getSequence(), "Sending now. is current sequence.");
480450
try {
481451
send(req);
482452
} catch (AgentUnavailableException e) {
483-
if (logger.isDebugEnabled()) {
484-
logger.debug(log(req.getSequence(), "Unable to send the next sequence"));
485-
}
453+
logger.debug(LOG_SEQ_FORMATTED_STRING, req.getSequence(), "Unable to send the next sequence");
486454
cancel(req.getSequence());
487455
}
488456
_currentSequence = req.getSequence();

0 commit comments

Comments
 (0)