You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by vi...@apache.org on 2013/03/20 08:36:33 UTC
svn commit: r1458667 - in /oozie/trunk:
core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java
core/src/main/java/org/apache/oozie/service/RecoveryService.java
release-log.txt
Author: virag
Date: Wed Mar 20 07:36:33 2013
New Revision: 1458667
URL: http://svn.apache.org/r1458667
Log:
OOZIE-1274 change recovery service interval to make it consistent with oozie-default.xml (ryota via virag)
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/service/RecoveryService.java
oozie/trunk/release-log.txt
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java?rev=1458667&r1=1458666&r2=1458667&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java Wed Mar 20 07:36:33 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/trunk/core/src/main/java/org/apache/oozie/service/RecoveryService.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/service/RecoveryService.java?rev=1458667&r1=1458666&r2=1458667&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/service/RecoveryService.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/service/RecoveryService.java Wed Mar 20 07:36:33 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/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1458667&r1=1458666&r2=1458667&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Wed Mar 20 07:36:33 2013
@@ -7,6 +7,7 @@ OOZIE-1239 Bump up trunk to 4.1.0-SNAPSH
-- 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)