[incubator-dolphinscheduler] branch 1.3.2-release updated: fix ds muti-level directory in zk, which lead to fail to assign work

[ch...@apache.org]

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

chenxingchun pushed a commit to branch 1.3.2-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/1.3.2-release by this push:
     new 5fdc43c  fix ds muti-level directory in zk, which lead to fail to assign work
     new 96a869d  Merge pull request #3506 from XiaotaoYi/1.3.2-release
5fdc43c is described below

commit 5fdc43cdca554dab11920e862c845a5013bc1bc7
Author: XiaotaoYi <v-...@hotmail.com>
AuthorDate: Fri Aug 14 23:00:57 2020 +0800

    fix ds muti-level directory in zk, which lead to fail to assign work
---
 .../apache/dolphinscheduler/server/registry/ZookeeperNodeManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/registry/ZookeeperNodeManager.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/registry/ZookeeperNodeManager.java
index 278da60..864276b 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/registry/ZookeeperNodeManager.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/registry/ZookeeperNodeManager.java
@@ -155,10 +155,10 @@ public class ZookeeperNodeManager implements InitializingBean {
 
         private String parseGroup(String path){
             String[] parts = path.split("\\/");
-            if(parts.length != 6){
+            if(parts.length < 6){
                 throw new IllegalArgumentException(String.format("worker group path : %s is not valid, ignore", path));
             }
-            String group = parts[4];
+            String group = parts[parts.length - 2];
             return group;
         }
     }