Repository: oozie Updated Branches: refs/heads/master 349a434a5 -> 817d81971
OOZIE-2506 Add logs into RecoverService for logging information about queued commands Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/817d8197 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/817d8197 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/817d8197 Branch: refs/heads/master Commit: 817d81971ca8118539f5428ca049b26d74459be7 Parents: 349a434 Author: jvishwakarma <[email protected]> Authored: Mon Jul 25 23:18:04 2016 +0530 Committer: jvishwakarma <[email protected]> Committed: Mon Jul 25 23:18:04 2016 +0530 ---------------------------------------------------------------------- .../apache/oozie/service/RecoveryService.java | 42 +++++++++++++------- release-log.txt | 1 + 2 files changed, 28 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/817d8197/core/src/main/java/org/apache/oozie/service/RecoveryService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/service/RecoveryService.java b/core/src/main/java/org/apache/oozie/service/RecoveryService.java index abcb6a8..64a67d6 100644 --- a/core/src/main/java/org/apache/oozie/service/RecoveryService.java +++ b/core/src/main/java/org/apache/oozie/service/RecoveryService.java @@ -150,7 +150,7 @@ public class RecoveryService implements Service { runWFRecovery(); runCoordActionRecovery(); runBundleRecovery(); - log.debug("QUEUING [{0}] for potential recovery", msg.toString()); + log.debug("QUEUED [{0}] for potential recovery", msg.toString()); boolean ret = false; if (null != callables) { ret = Services.get().get(CallableQueueService.class).queueSerial(callables); @@ -185,7 +185,7 @@ public class RecoveryService implements Service { log.warn("Error reading bundle actions from database", ex); return; } - msg.append(", BUNDLE_ACTIONS : " + bactions.size()); + msg.append(", BUNDLE_ACTIONS : ").append(bactions.size()); for (BundleActionBean baction : bactions) { try { Services.get().get(InstrumentationService.class).get() @@ -292,15 +292,15 @@ public class RecoveryService implements Service { .incr(INSTRUMENTATION_GROUP, INSTR_RECOVERED_COORD_ACTIONS_COUNTER, 1); if (caction.getStatus() == CoordinatorActionBean.Status.WAITING) { queueCallable(new CoordActionInputCheckXCommand(caction.getId(), caction.getJobId())); - log.info("Recover a WAITING coord action and resubmit CoordActionInputCheckXCommand :" - + caction.getId()); + log.debug("Recover a coord action from [WAITING] and resubmit CoordActionInputCheckXCommand :[{0}]" + , caction.getId()); if (caction.getPushMissingDependencies() != null && caction.getPushMissingDependencies().length() != 0) { queueCallable(new CoordPushDependencyCheckXCommand(caction.getId(), true, true), pushMissingDepDelay); pushMissingDepDelay = pushMissingDepDelay + pushMissingDepInterval; - log.info("Recover a WAITING coord action and resubmit CoordPushDependencyCheckX :" - + caction.getId()); + log.debug("Recover a coord action from [WAITING] and resubmit CoordPushDependencyCheckX :[{0}]" + , caction.getId()); } } else if (caction.getStatus() == CoordinatorActionBean.Status.SUBMITTED) { @@ -308,27 +308,28 @@ public class RecoveryService implements Service { CoordJobQuery.GET_COORD_JOB_USER_APPNAME, caction.getJobId()); queueCallable(new CoordActionStartXCommand(caction.getId(), coordJob.getUser(), coordJob.getAppName(), caction.getJobId())); - - log.info("Recover a SUBMITTED coord action and resubmit CoordActionStartCommand :" - + caction.getId()); + log.debug("Recover a coord action from [SUBMITTED] and resubmit CoordActionStartCommand :[{0}]", + caction.getId()); } else if (caction.getStatus() == CoordinatorActionBean.Status.SUSPENDED) { if (caction.getExternalId() != null && caction.getPending() > 1) { queueCallable(new SuspendXCommand(caction.getExternalId())); - log.debug("Recover a SUSPENDED coord action and resubmit SuspendXCommand :" - + caction.getId()); + log.debug("Recover a coord action from [SUSPENDED] and resubmit SuspendXCommand :[{0}]" + , caction.getId()); } } else if (caction.getStatus() == CoordinatorActionBean.Status.KILLED) { if (caction.getExternalId() != null) { queueCallable(new KillXCommand(caction.getExternalId())); - log.debug("Recover a KILLED coord action and resubmit KillXCommand :" + caction.getId()); + log.debug("Recover a coord action from [KILLED] and resubmit KillXCommand :[{0}]" + , caction.getId()); } } else if (caction.getStatus() == CoordinatorActionBean.Status.RUNNING) { if (caction.getExternalId() != null) { queueCallable(new ResumeXCommand(caction.getExternalId())); - log.debug("Recover a RUNNING coord action and resubmit ResumeXCommand :" + caction.getId()); + log.debug("Recover a coord action from [RUNNING] and resubmit ResumeXCommand :[{0}]" + , caction.getId()); } } else if (caction.getStatus() == CoordinatorActionBean.Status.READY) { @@ -355,7 +356,7 @@ public class RecoveryService implements Service { msg.append(", COORD_READY_JOBS : " + coordJobIds.size()); for (String jobid : coordJobIds) { queueCallable(new CoordActionReadyXCommand(jobid)); - log.info("Recover READY coord actions for jobid :" + jobid); + log.debug("Recover a coord action from [READY] resubmit CoordActionReadyXCommand :[{0}]", jobid); } } catch (Exception ex) { @@ -395,28 +396,39 @@ public class RecoveryService implements Service { if (action.getStatus() == WorkflowActionBean.Status.PREP || action.getStatus() == WorkflowActionBean.Status.START_MANUAL) { queueCallable(new ActionStartXCommand(action.getId(), action.getType())); + log.debug("Recover a workflow action from [{0}] status and resubmit ActionStartXCommand :[{1}]", + action.getStatus(), action.getId()); } else if (action.getStatus() == WorkflowActionBean.Status.START_RETRY) { Date nextRunTime = action.getPendingAge(); queueCallable(new ActionStartXCommand(action.getId(), action.getType()), nextRunTime.getTime() - System.currentTimeMillis()); + log.debug("Recover a workflow action from [START_RETRY] status and resubmit ActionStartXCommand :[{0}]" + , action.getId()); } else if (action.getStatus() == WorkflowActionBean.Status.DONE || action.getStatus() == WorkflowActionBean.Status.END_MANUAL) { queueCallable(new ActionEndXCommand(action.getId(), action.getType())); + log.debug("Recover a workflow action from [{0}] status and resubmit ActionEndXCommand :[{1}]", + action.getStatus(), action.getId()); } else if (action.getStatus() == WorkflowActionBean.Status.END_RETRY) { Date nextRunTime = action.getPendingAge(); queueCallable(new ActionEndXCommand(action.getId(), action.getType()), nextRunTime.getTime() - System.currentTimeMillis()); - + log.debug("Recover a workflow action from [END_RETRY] status and resubmit ActionEndXCommand :[{0}]", + action.getId()); } else if (action.getStatus() == WorkflowActionBean.Status.OK || action.getStatus() == WorkflowActionBean.Status.ERROR) { queueCallable(new SignalXCommand(action.getJobId(), action.getId())); + log.debug("Recover a workflow action from [{0}] status and resubmit SignalXCommand :[{1}]", + action.getStatus(), action.getId()); } else if (action.getStatus() == WorkflowActionBean.Status.USER_RETRY) { queueCallable(new ActionStartXCommand(action.getId(), action.getType())); + log.debug("Recover a workflow action from [USER_RETRY] status and resubmit ActionStartXCommand :[{0}]" + , action.getId()); } } } http://git-wip-us.apache.org/repos/asf/oozie/blob/817d8197/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 26df56e..e37008f 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2506 Add logs into RecoverService for logging information about queued commands (abhishekbafna via jaydeepvishwakarma) OOZIE-2515 Duplicate information for "Changing endtime/pausetime of a Bundle Job" in CommandLineTool wiki (abhishekbafna via jaydeepvishwakarma) OOZIE-2390 Rerun with failed option removing completed output data (jaydeepvishwakarma) OOZIE-2462 When calling ParamChecker.notNull() in CoordActionsIgnoreXCommand.java, "Action" should be passed instead of "Action cannot be null" (mballur via jaydeepvishwakarma)
