Author: virag
Date: Wed Mar 20 07:36:01 2013
New Revision: 1458666
URL: http://svn.apache.org/r1458666
Log:
OOZIE-1274 change recovery service interval to make it consistent with
oozie-default.xml (ryota via virag)
Modified:
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/service/RecoveryService.java
oozie/branches/branch-4.0/release-log.txt
Modified:
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java?rev=1458666&r1=1458665&r2=1458666&view=diff
==============================================================================
---
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java
(original)
+++
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java
Wed Mar 20 07:36:01 2013
@@ -164,9 +164,8 @@ public class CoordPushDependencyCheckXCo
&& coordAction.getMissingDependencies().length() > 0) {
// Queue again on exception as RecoveryService will not
queue this again with
// the action being updated regularly by
CoordActionInputCheckXCommand
- final RecoveryService recoveryService =
Services.get().get(RecoveryService.class);
- callableQueueService.queue(new
CoordPushDependencyCheckXCommand(coordAction.getId()),
-
recoveryService.getRecoveryServiceInterval(Services.get().getConf()) * 1000);
+ callableQueueService.queue(new
CoordPushDependencyCheckXCommand(coordAction.getId()), Services
+
.get().getConf().getInt(RecoveryService.CONF_COORD_OLDER_THAN, 600) * 1000);
}
throw new CommandException(ErrorCode.E1021, e.getMessage(), e);
}
Modified:
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/service/RecoveryService.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/service/RecoveryService.java?rev=1458666&r1=1458665&r2=1458666&view=diff
==============================================================================
---
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/service/RecoveryService.java
(original)
+++
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/service/RecoveryService.java
Wed Mar 20 07:36:01 2013
@@ -432,7 +432,7 @@ public class RecoveryService implements
}
public int getRecoveryServiceInterval(Configuration conf){
- return conf.getInt(CONF_SERVICE_INTERVAL, 600);
+ return conf.getInt(CONF_SERVICE_INTERVAL, 60);
}
/**
Modified: oozie/branches/branch-4.0/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/release-log.txt?rev=1458666&r1=1458665&r2=1458666&view=diff
==============================================================================
--- oozie/branches/branch-4.0/release-log.txt (original)
+++ oozie/branches/branch-4.0/release-log.txt Wed Mar 20 07:36:01 2013
@@ -1,5 +1,6 @@
-- Oozie 4.0.0 (unreleased)
+OOZIE-1274 change recovery service interval to make it consistent with
oozie-default.xml (ryota via virag)
OOZIE-1246 appname need to be persisted on SLA event table by SLA status event
(ryota via virag)
OOZIE-1270 Querying job directly does not pop correct information for
coordinator and bundle (rohini via virag)
OOZIE-1269 Exception in push dependency check when there is also a pull
dependency leaves it in waiting till timeout (rohini via virag)
