Repository: oozie Updated Branches: refs/heads/branch-4.1 d71d2e368 -> 29c553fe9
OOZIE-1934 coordinator action repeatedly picked up by cachePurgeWorker of PartitionDependencyManagerService (ryota) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/29c553fe Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/29c553fe Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/29c553fe Branch: refs/heads/branch-4.1 Commit: 29c553fe9b6a5fd65877eb23b5894ed8cbd5f976 Parents: d71d2e3 Author: egashira <[email protected]> Authored: Tue Jul 22 14:32:31 2014 -0700 Committer: egashira <[email protected]> Committed: Tue Jul 22 14:32:31 2014 -0700 ---------------------------------------------------------------------- .../oozie/dependency/hcat/SimpleHCatDependencyCache.java | 1 + .../oozie/service/PartitionDependencyManagerService.java | 6 +++++- release-log.txt | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/29c553fe/core/src/main/java/org/apache/oozie/dependency/hcat/SimpleHCatDependencyCache.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/dependency/hcat/SimpleHCatDependencyCache.java b/core/src/main/java/org/apache/oozie/dependency/hcat/SimpleHCatDependencyCache.java index 08aa8f9..758ae26 100644 --- a/core/src/main/java/org/apache/oozie/dependency/hcat/SimpleHCatDependencyCache.java +++ b/core/src/main/java/org/apache/oozie/dependency/hcat/SimpleHCatDependencyCache.java @@ -375,6 +375,7 @@ public class SimpleHCatDependencyCache implements HCatDependencyCache { public void removeNonWaitingCoordActions(Set<String> coordActions) { HCatAccessorService hcatService = Services.get().get(HCatAccessorService.class); for (String coordActionId : coordActions) { + LOG.info("Removing non waiting coord action {0} from partition dependency map", coordActionId); synchronized (actionPartitionMap) { Map<String, Collection<String>> partitionMap = actionPartitionMap.get(coordActionId); if (partitionMap != null) { http://git-wip-us.apache.org/repos/asf/oozie/blob/29c553fe/core/src/main/java/org/apache/oozie/service/PartitionDependencyManagerService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/service/PartitionDependencyManagerService.java b/core/src/main/java/org/apache/oozie/service/PartitionDependencyManagerService.java index 41d1ba2..04326ae 100644 --- a/core/src/main/java/org/apache/oozie/service/PartitionDependencyManagerService.java +++ b/core/src/main/java/org/apache/oozie/service/PartitionDependencyManagerService.java @@ -20,6 +20,7 @@ package org.apache.oozie.service; import java.util.Collection; import java.util.Date; import java.util.HashSet; +import java.util.Iterator; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -107,7 +108,9 @@ public class PartitionDependencyManagerService implements Service { private void purgeMissingDependency(int timeToLive) { long currentTime = new Date().getTime(); Set<String> staleActions = new HashSet<String>(); - for(String actionId : registeredCoordActionMap.keySet()) { + Iterator<String> actionItr = registeredCoordActionMap.keySet().iterator(); + while(actionItr.hasNext()){ + String actionId = actionItr.next(); Long regTime = registeredCoordActionMap.get(actionId); if(regTime < (currentTime - timeToLive * 1000)){ CoordinatorActionBean caBean = null; @@ -119,6 +122,7 @@ public class PartitionDependencyManagerService implements Service { } if(caBean != null && !caBean.getStatus().equals(CoordinatorAction.Status.WAITING)){ staleActions.add(actionId); + actionItr.remove(); } } } http://git-wip-us.apache.org/repos/asf/oozie/blob/29c553fe/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 874e58a..5c4146b 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.1.0 release (trunk - unreleased) +OOZIE-1934 coordinator action repeatedly picked up by cachePurgeWorker of PartitionDependencyManagerService (ryota) OOZIE-1933 SLACalculatorMemory HA changes assume SLARegistrationBean exists for all jobs (mona) OOZIE-1935 Log level (ActionStartXCommand) and Doc fix (CoordinatorFunctionalSpec) (mona) OOZIE-1586 upgrade oozie to hive 13.1 (including hcatalog) (raviprak via rkanter)
