[oozie] branch master updated: OOZIE-3067 [core] Remove duplicate logic from ZKJobsConcurrencyService (dionusos via andras.piros)

[andras]

This is an automated email from the ASF dual-hosted git repository.

andras pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/oozie.git


The following commit(s) were added to refs/heads/master by this push:
     new 72ab9b3  OOZIE-3067 [core] Remove duplicate logic from 
ZKJobsConcurrencyService (dionusos via andras.piros)
72ab9b3 is described below

commit 72ab9b346f1c183b18fd367d2ff18c5e5cc79bb8
Author: Andras Piros <andras.pi...@cloudera.com>
AuthorDate: Fri Jan 4 11:41:33 2019 +0100

    OOZIE-3067 [core] Remove duplicate logic from ZKJobsConcurrencyService 
(dionusos via andras.piros)
---
 .../org/apache/oozie/service/ZKJobsConcurrencyService.java | 14 ++------------
 release-log.txt                                            |  1 +
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git 
a/core/src/main/java/org/apache/oozie/service/ZKJobsConcurrencyService.java 
b/core/src/main/java/org/apache/oozie/service/ZKJobsConcurrencyService.java
index a7a902f..75d088a 100644
--- a/core/src/main/java/org/apache/oozie/service/ZKJobsConcurrencyService.java
+++ b/core/src/main/java/org/apache/oozie/service/ZKJobsConcurrencyService.java
@@ -197,18 +197,8 @@ public class ZKJobsConcurrencyService extends 
JobsConcurrencyService implements
      */
     @Override
     public Map<String, String> getOtherServerUrls() {
-        Map<String, String> urls = new HashMap<String, String>();
-        List<ServiceInstance<Map>> oozies = zk.getAllMetaData();
-        for (ServiceInstance<Map> oozie : oozies) {
-            Map<String, String> metadata = oozie.getPayload();
-            String id = metadata.get(ZKUtils.ZKMetadataKeys.OOZIE_ID);
-
-            if (id.equals(zk.getZKId())) {
-                continue;
-            }
-            String url = metadata.get(ZKUtils.ZKMetadataKeys.OOZIE_URL);
-            urls.put(id, url);
-        }
+        Map<String, String> urls = getServerUrls();
+        urls.remove(zk.getZKId());
         return urls;
     }
 
diff --git a/release-log.txt b/release-log.txt
index 6721828..8735251 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.2.0 release (trunk - unreleased)
 
+OOZIE-3067 [core] Remove duplicate logic from ZKJobsConcurrencyService 
(dionusos via andras.piros)
 OOZIE-3186 [core] Oozie is unable to use configuration linked using 
jceks://file/ (dionusos via andras.piros)
 OOZIE-3194 [tools] Oozie should set proper permissions to sharelib after 
upload (dionusos via andras.piros)
 OOZIE-3341 [docs] Fix difference between command line help and documentation 
(asalamon74 via andras.piros)