Repository: oozie Updated Branches: refs/heads/master e62289439 -> 758973f66
OOZIE-2069 RecoveryService reads incorrect configuration Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/758973f6 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/758973f6 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/758973f6 Branch: refs/heads/master Commit: 758973f6624646ebb317b87349b0aa0e3e58f27e Parents: e622894 Author: Purshotam Shah <[email protected]> Authored: Tue Nov 25 13:55:39 2014 -0800 Committer: Purshotam Shah <[email protected]> Committed: Tue Nov 25 13:55:39 2014 -0800 ---------------------------------------------------------------------- .../org/apache/oozie/service/RecoveryService.java | 14 +++++++------- release-log.txt | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/758973f6/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 21bfcfc..9f31e88 100644 --- a/core/src/main/java/org/apache/oozie/service/RecoveryService.java +++ b/core/src/main/java/org/apache/oozie/service/RecoveryService.java @@ -74,23 +74,23 @@ import org.jdom.Element; */ public class RecoveryService implements Service { - public static final String CONF_PREFIX = Service.CONF_PREFIX + "RecoveryService."; - public static final String CONF_PREFIX_WF_ACTIONS = Service.CONF_PREFIX + "wf.actions."; - public static final String CONF_PREFIX_COORD = Service.CONF_PREFIX + "coord."; - public static final String CONF_PREFIX_BUNDLE = Service.CONF_PREFIX + "bundle."; + public static final String RECOVERY_SERVICE_CONF_PREFIX = Service.CONF_PREFIX + "RecoveryService."; + public static final String CONF_PREFIX_WF_ACTIONS = RECOVERY_SERVICE_CONF_PREFIX + "wf.actions."; + public static final String CONF_PREFIX_COORD = RECOVERY_SERVICE_CONF_PREFIX + "coord."; + public static final String CONF_PREFIX_BUNDLE = RECOVERY_SERVICE_CONF_PREFIX + "bundle."; /** * Time interval, in seconds, at which the recovery service will be scheduled to run. */ - public static final String CONF_SERVICE_INTERVAL = CONF_PREFIX + "interval"; + public static final String CONF_SERVICE_INTERVAL = RECOVERY_SERVICE_CONF_PREFIX + "interval"; /** * The number of callables to be queued in a batch. */ - public static final String CONF_CALLABLE_BATCH_SIZE = CONF_PREFIX + "callable.batch.size"; + public static final String CONF_CALLABLE_BATCH_SIZE = RECOVERY_SERVICE_CONF_PREFIX + "callable.batch.size"; /** * Delay for the push missing dependencies in milliseconds. */ - public static final String CONF_PUSH_DEPENDENCY_INTERVAL = CONF_PREFIX + "push.dependency.interval"; + public static final String CONF_PUSH_DEPENDENCY_INTERVAL = RECOVERY_SERVICE_CONF_PREFIX + "push.dependency.interval"; /** * Age of actions to queue, in seconds. http://git-wip-us.apache.org/repos/asf/oozie/blob/758973f6/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 195b394..7b1dad5 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OOZIE-2069 RecoveryService reads incorrect configuration (puru) OOZIE-2074 Compatibility issue with Yarn and Hadoop 0.23/2.x (jaydeepvishwakarma via shwethags) OOZIE-1983 Add spark action executor (pavan kumar via rkanter) OOZIE-1985 support dropping hcat dataset in coord rerun with cleanup option (ryota)
