Commit cc1a5ff9 authored by loushang's avatar loushang
Browse files

refactor zk tree cache

parent 84df6ed8

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/zk/AbstractListener.java

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
/*

 * Licensed to the Apache Software Foundation (ASF) under one or more

 * contributor license agreements.  See the NOTICE file distributed with

 * this work for additional information regarding copyright ownership.

 * The ASF licenses this file to You under the Apache License, Version 2.0

 * (the "License"); you may not use this file except in compliance with

 * the License.  You may obtain a copy of the License at

 *

 *    http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package org.apache.dolphinscheduler.common.zk;



import org.apache.curator.framework.CuratorFramework;

import org.apache.curator.framework.recipes.cache.TreeCacheEvent;

import org.apache.curator.framework.recipes.cache.TreeCacheListener;



public abstract class AbstractListener implements TreeCacheListener {



    @Override

    public final void childEvent(final CuratorFramework client, final TreeCacheEvent event) throws Exception {

        String path = null == event.getData() ? "" : event.getData().getPath();

        if (path.isEmpty()) {

            return;

        }

        dataChanged(client, event, path);

    }



    protected abstract void dataChanged(final CuratorFramework client, final TreeCacheEvent event, final String path);

}

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/zk/ZKMasterClient.java

+2 −8
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import org.apache.dolphinscheduler.common.Constants; 
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;

import org.apache.dolphinscheduler.common.enums.ZKNodeType;

import org.apache.dolphinscheduler.common.model.Server;

import org.apache.dolphinscheduler.common.zk.AbstractListener;

import org.apache.dolphinscheduler.common.zk.AbstractZKClient;

import org.apache.dolphinscheduler.dao.AlertDao;

import org.apache.dolphinscheduler.dao.DaoFactory;
@@ -31,9 +30,6 @@ import org.apache.dolphinscheduler.dao.entity.TaskInstance; 
import org.apache.dolphinscheduler.server.utils.ProcessUtils;

import org.apache.commons.lang.StringUtils;

import org.apache.curator.framework.CuratorFramework;

import org.apache.curator.framework.recipes.cache.PathChildrenCache;

import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;

import org.apache.curator.framework.recipes.cache.PathChildrenCacheListener;

import org.apache.curator.framework.recipes.locks.InterProcessMutex;

import org.apache.curator.utils.ThreadUtils;

import org.slf4j.Logger;
@@ -160,12 +156,10 @@ public class ZKMasterClient extends AbstractZKClient { 
	 */

	@Override

	protected void dataChanged(CuratorFramework client, TreeCacheEvent event, String path) {

		if(path.equals(getZNodeParentPath(ZKNodeType.MASTER))){  //monitor master

			logger.info("master path event touch down");

		if(path.startsWith(getZNodeParentPath(ZKNodeType.MASTER)+Constants.SINGLE_SLASH)){  //monitor master

			handleMasterEvent(event,path);



		}else if(path.equals(getZNodeParentPath(ZKNodeType.WORKER))){  //monitor worker

			logger.info("worker path event touch down");

		}else if(path.startsWith(getZNodeParentPath(ZKNodeType.WORKER)+Constants.SINGLE_SLASH)){  //monitor worker

			handleWorkerEvent(event,path);

		}

		//other path event, ignore

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/zk/ZKWorkerClient.java

+1 −8
Original line number Diff line number Diff line
@@ -19,20 +19,13 @@ package org.apache.dolphinscheduler.server.zk; 
import org.apache.curator.framework.recipes.cache.TreeCacheEvent;

import org.apache.dolphinscheduler.common.Constants;

import org.apache.dolphinscheduler.common.enums.ZKNodeType;

import org.apache.dolphinscheduler.common.zk.AbstractListener;

import org.apache.dolphinscheduler.common.zk.AbstractZKClient;

import org.apache.commons.lang.StringUtils;

import org.apache.curator.framework.CuratorFramework;

import org.apache.curator.framework.recipes.cache.PathChildrenCache;

import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;

import org.apache.curator.framework.recipes.cache.PathChildrenCacheListener;

import org.apache.curator.utils.ThreadUtils;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.stereotype.Component;



import java.util.concurrent.ThreadFactory;





/**

 *  zookeeper worker client
@@ -89,7 +82,7 @@ public class ZKWorkerClient extends AbstractZKClient { 
	 */

	@Override

	protected void dataChanged(CuratorFramework client, TreeCacheEvent event, String path) {

		if(path.equals(getZNodeParentPath(ZKNodeType.WORKER))){

		if(path.startsWith(getZNodeParentPath(ZKNodeType.WORKER)+Constants.SINGLE_SLASH)){

			handleWorkerEvent(event,path);

		}

	}