Unverified Commit 5b7efd2d authored by tswstarplanet's avatar tswstarplanet Committed by GitHub
Browse files

[Feature-3134]Refactor to use a shared singleton Curator Zookeeper Client (#3244) 



* [Feature-3134]Refactor to use a shared singleton Curator Zookeeper Client

* autowire CuratorZookeeperClient to ZookeeperOperator

* [Improvement] Add the issue specifications reference (#3221)

* log zookeeper address when the connect state change

* resume the operation of add connect state listener in MasterRegistry

Co-authored-by: default avatarYichao Yang <1048262223@qq.com>
parent 32e8a9d5

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitor.java

+2 −3
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ public class ZookeeperMonitor extends AbstractZKClient { 
					state.getZookeeperInfo();

				}



				String hostName = zookeeperServer;

				int connections = state.getConnections();

				int watches = state.getWatches();

				long sent = state.getSent();
@@ -95,7 +94,7 @@ public class ZookeeperMonitor extends AbstractZKClient { 
				int status = ok ? 1 : 0;

				Date date = new Date();



				ZookeeperRecord zookeeperRecord = new ZookeeperRecord(hostName,connections,watches,sent,received,mode,minLatency,avgLatency,maxLatency,nodeCount,status,date);

				ZookeeperRecord zookeeperRecord = new ZookeeperRecord(zookeeperServer,connections,watches,sent,received,mode,minLatency,avgLatency,maxLatency,nodeCount,status,date);

				list.add(zookeeperRecord);



			}

dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThreadTest.java

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import org.apache.dolphinscheduler.server.registry.ZookeeperRegistryCenter; 
import org.apache.dolphinscheduler.server.zk.SpringZKServer;

import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;

import org.apache.dolphinscheduler.service.process.ProcessService;

import org.apache.dolphinscheduler.service.zk.CuratorZookeeperClient;

import org.apache.dolphinscheduler.service.zk.ZookeeperCachedOperator;

import org.apache.dolphinscheduler.service.zk.ZookeeperConfig;

import org.junit.Test;
@@ -43,7 +44,7 @@ import java.util.Set; 
@RunWith(SpringJUnit4ClassRunner.class)

@ContextConfiguration(classes={DependencyConfig.class, SpringApplicationContext.class, SpringZKServer.class,

        NettyExecutorManager.class, ExecutorDispatcher.class, ZookeeperRegistryCenter.class, TaskPriorityQueueConsumer.class,

        ZookeeperNodeManager.class, ZookeeperCachedOperator.class, ZookeeperConfig.class})

        ZookeeperNodeManager.class, ZookeeperCachedOperator.class, ZookeeperConfig.class, CuratorZookeeperClient.class})

public class MasterTaskExecThreadTest {

dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/AbstractZKClient.java

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ public abstract class AbstractZKClient extends ZookeeperCachedOperator { 
	@Override

	public String toString() {

		return "AbstractZKClient{" +

				"zkClient=" + zkClient +

				"zkClient=" + getZkClient() +

				", deadServerZNodeParentPath='" + getZNodeParentPath(ZKNodeType.DEAD_SERVER) + '\'' +

				", masterZNodeParentPath='" + getZNodeParentPath(ZKNodeType.MASTER) + '\'' +

				", workerZNodeParentPath='" + getZNodeParentPath(ZKNodeType.WORKER) + '\'' +

dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/CuratorZookeeperClient.java

0 → 100644
+119 −0
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.service.zk;



import org.apache.commons.lang.StringUtils;

import org.apache.curator.framework.CuratorFramework;

import org.apache.curator.framework.CuratorFrameworkFactory;

import org.apache.curator.framework.api.ACLProvider;

import org.apache.curator.framework.state.ConnectionState;

import org.apache.curator.retry.ExponentialBackoffRetry;

import org.apache.zookeeper.ZooDefs;

import org.apache.zookeeper.data.ACL;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.InitializingBean;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Component;



import java.nio.charset.StandardCharsets;

import java.util.List;



import static org.apache.dolphinscheduler.common.utils.Preconditions.checkNotNull;



/**

 * Shared Curator zookeeper client

 */

@Component

public class CuratorZookeeperClient implements InitializingBean {

    private final Logger logger = LoggerFactory.getLogger(CuratorZookeeperClient.class);



    @Autowired

    private ZookeeperConfig zookeeperConfig;



    private CuratorFramework zkClient;





    @Override

    public void afterPropertiesSet() throws Exception {

        this.zkClient = buildClient();

        initStateLister();

    }



    private CuratorFramework buildClient() {

        logger.info("zookeeper registry center init, server lists is: {}.", zookeeperConfig.getServerList());



        CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder().ensembleProvider(new DefaultEnsembleProvider(checkNotNull(zookeeperConfig.getServerList(),"zookeeper quorum can't be null")))

                .retryPolicy(new ExponentialBackoffRetry(zookeeperConfig.getBaseSleepTimeMs(), zookeeperConfig.getMaxRetries(), zookeeperConfig.getMaxSleepMs()));



        //these has default value

        if (0 != zookeeperConfig.getSessionTimeoutMs()) {

            builder.sessionTimeoutMs(zookeeperConfig.getSessionTimeoutMs());

        }

        if (0 != zookeeperConfig.getConnectionTimeoutMs()) {

            builder.connectionTimeoutMs(zookeeperConfig.getConnectionTimeoutMs());

        }

        if (StringUtils.isNotBlank(zookeeperConfig.getDigest())) {

            builder.authorization("digest", zookeeperConfig.getDigest().getBytes(StandardCharsets.UTF_8)).aclProvider(new ACLProvider() {



                @Override

                public List<ACL> getDefaultAcl() {

                    return ZooDefs.Ids.CREATOR_ALL_ACL;

                }



                @Override

                public List<ACL> getAclForPath(final String path) {

                    return ZooDefs.Ids.CREATOR_ALL_ACL;

                }

            });

        }

        zkClient = builder.build();

        zkClient.start();

        try {

            zkClient.blockUntilConnected();

        } catch (final Exception ex) {

            throw new RuntimeException(ex);

        }

        return zkClient;

    }



    public void initStateLister() {

        checkNotNull(zkClient);



        zkClient.getConnectionStateListenable().addListener((client, newState) -> {

            if(newState == ConnectionState.LOST){

                logger.error("connection lost from zookeeper");

            } else if(newState == ConnectionState.RECONNECTED){

                logger.info("reconnected to zookeeper");

            } else if(newState == ConnectionState.SUSPENDED){

                logger.warn("connection SUSPENDED to zookeeper");

            }

        });

    }



    public ZookeeperConfig getZookeeperConfig() {

        return zookeeperConfig;

    }



    public void setZookeeperConfig(ZookeeperConfig zookeeperConfig) {

        this.zookeeperConfig = zookeeperConfig;

    }



    public CuratorFramework getZkClient() {

        return zkClient;

    }

}
 
 No newline at end of file

dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/zk/ZookeeperCachedOperator.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ public class ZookeeperCachedOperator extends ZookeeperOperator { 
     */

    @Override

    protected void registerListener() {

        treeCache = new TreeCache(zkClient, getZookeeperConfig().getDsRoot() + "/nodes");

        treeCache = new TreeCache(getZkClient(), getZookeeperConfig().getDsRoot() + "/nodes");

        logger.info("add listener to zk path: {}", getZookeeperConfig().getDsRoot());

        try {

            treeCache.start();