[GitHub] [skywalking] arugal commented on a change in pull request #3074: fix 3069

[GitBox <gi...@apache.org>]

arugal commented on a change in pull request #3074: fix 3069
URL: https://github.com/apache/skywalking/pull/3074#discussion_r303900369
 
 

 ##########
 File path: oap-server/server-cluster-plugin/cluster-consul-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ITClusterModuleConsulProviderFunctionalTest.java
 ##########
 @@ -0,0 +1,266 @@
+/*
+ * 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.skywalking.oap.server.cluster.plugin.consul;
+
+import com.google.common.base.Strings;
+import com.orbitz.consul.AgentClient;
+import com.orbitz.consul.Consul;
+import com.orbitz.consul.model.agent.ImmutableRegistration;
+import com.orbitz.consul.model.agent.Registration;
+import org.apache.skywalking.apm.util.StringUtil;
+import org.apache.skywalking.oap.server.core.cluster.ClusterNodesQuery;
+import org.apache.skywalking.oap.server.core.cluster.ClusterRegister;
+import org.apache.skywalking.oap.server.core.cluster.RemoteInstance;
+import org.apache.skywalking.oap.server.core.cluster.ServiceRegisterException;
+import org.apache.skywalking.oap.server.core.remote.client.Address;
+import org.apache.skywalking.oap.server.library.module.ModuleProvider;
+import org.apache.skywalking.oap.server.telemetry.api.TelemetryRelatedContext;
+import org.junit.Before;
+import org.junit.Test;
+import org.powermock.reflect.Whitebox;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author: zhangwei
+ */
+public class ITClusterModuleConsulProviderFunctionalTest {
+
+    private String consulAddress;
+
+    @Before
+    public void before() {
+        consulAddress = System.getProperty("consul.address");
+        assertFalse(StringUtil.isEmpty(consulAddress));
+    }
+
+    @Test
+    public void registerRemote() throws Exception {
+        final String serviceName = "register_remote";
+        ModuleProvider provider = createProvider(serviceName);
+
+        Address selfAddress = new Address("127.0.0.1", 1000, true);
+        RemoteInstance instance = new RemoteInstance(selfAddress);
+        getClusterRegister(provider).registerRemote(instance);
+
+        List<RemoteInstance> remoteInstances = queryRemoteNodes(provider, 1);
+        assertEquals(1, remoteInstances.size());
+        Address queryAddress = remoteInstances.get(0).getAddress();
+        assertEquals(selfAddress, queryAddress);
+        assertTrue(queryAddress.isSelf());
+    }
+
+    @Test
+    public void registerRemoteOfInternal() throws Exception {
+        final String serviceName = "register_remote_internal";
+        ModuleProvider provider =
+            createProvider(serviceName, "127.0.1.2", 1001);
+
+        Address selfAddress = new Address("127.0.0.2", 1002, true);
+        RemoteInstance instance = new RemoteInstance(selfAddress);
+        getClusterRegister(provider).registerRemote(instance);
+
+        List<RemoteInstance> remoteInstances = queryRemoteNodes(provider, 1);
+
+        ClusterModuleConsulConfig config = (ClusterModuleConsulConfig) provider.createConfigBeanIfAbsent();
+        assertEquals(1, remoteInstances.size());
+        Address queryAddress = remoteInstances.get(0).getAddress();
+        assertEquals(config.getInternalComHost(), queryAddress.getHost());
+        assertEquals(config.getInternalComPort(), queryAddress.getPort());
+        assertTrue(queryAddress.isSelf());
+    }
+
+    @Test
+    public void registerRemoteOfReceiver() throws Exception {
+        final String serviceName = "register_remote_receiver";
+        ModuleProvider providerA = createProvider(serviceName);
+        ModuleProvider providerB = createProvider(serviceName);
+
+        // Mixed or Aggregator
+        Address selfAddress = new Address("127.0.0.3", 1003, true);
+        RemoteInstance instance = new RemoteInstance(selfAddress);
+        getClusterRegister(providerA).registerRemote(instance);
+
+        // Receiver
+        List<RemoteInstance> remoteInstances = queryRemoteNodes(providerB, 1);
+        assertEquals(1, remoteInstances.size());
+        Address queryAddress = remoteInstances.get(0).getAddress();
+        assertEquals(selfAddress, queryAddress);
+        assertFalse(queryAddress.isSelf());
+    }
+
+    @Test
+    public void registerRemoteOfCluster() throws Exception {
+        final String serviceName = "register_remote_cluster";
+        ModuleProvider providerA = createProvider(serviceName);
+        ModuleProvider providerB = createProvider(serviceName);
+
+        Address addressA = new Address("127.0.0.4", 1004, true);
+        Address addressB = new Address("127.0.0.5", 1005, true);
+
+        RemoteInstance instanceA = new RemoteInstance(addressA);
+        RemoteInstance instanceB = new RemoteInstance(addressB);
+
+        getClusterRegister(providerA).registerRemote(instanceA);
+        getClusterRegister(providerB).registerRemote(instanceB);
+
+        List<RemoteInstance> remoteInstancesOfA = queryRemoteNodes(providerA, 2);
+        validateServiceInstance(addressA, addressB, remoteInstancesOfA);
+
+        List<RemoteInstance> remoteInstancesOfB = queryRemoteNodes(providerB, 2);
+        validateServiceInstance(addressB, addressA, remoteInstancesOfB);
+    }
+
+    @Test
+    public void unregisterRemoteOfCluster() throws Exception {
+        final String serviceName = "unregister_remote_cluster";
+        ModuleProvider providerA = createProvider(serviceName);
+        ModuleProvider providerB = createProvider(serviceName);
+
+        Address addressA = new Address("127.0.0.6", 1006, true);
+        Address addressB = new Address("127.0.0.7", 1007, true);
+
+        RemoteInstance instanceA = new RemoteInstance(addressA);
+        RemoteInstance instanceB = new RemoteInstance(addressB);
+
+        getClusterRegister(providerA).registerRemote(instanceA);
+        getClusterRegister(providerB).registerRemote(instanceB);
+
+        List<RemoteInstance> remoteInstancesOfA = queryRemoteNodes(providerA, 2);
+        validateServiceInstance(addressA, addressB, remoteInstancesOfA);
+
+        List<RemoteInstance> remoteInstancesOfB = queryRemoteNodes(providerB, 2);
+        validateServiceInstance(addressB, addressA, remoteInstancesOfB);
+
+        // unregister A
+        Consul client = Whitebox.getInternalState(providerA, "client");
+        AgentClient agentClient = client.agentClient();
+        agentClient.deregister(instanceA.getAddress().toString());
+
+        // only B
+        remoteInstancesOfB = queryRemoteNodes(providerB, 1, 120);
+        assertEquals(1, remoteInstancesOfB.size());
+        Address address = remoteInstancesOfB.get(0).getAddress();
+        assertEquals(address, addressB);
+        assertTrue(addressB.isSelf());
+    }
+
+    private ClusterModuleConsulProvider createProvider(String serviceName) throws Exception {
+        return createProvider(serviceName, null, 0);
+    }
+
+    private ClusterModuleConsulProvider createProvider(String serviceName, String internalComHost, int internalComPort) throws Exception {
+        ClusterModuleConsulProvider provider = new ClusterModuleConsulProvider();
+
+        ClusterModuleConsulConfig config = (ClusterModuleConsulConfig) provider.createConfigBeanIfAbsent();
+
+        config.setHostPort(consulAddress);
+        config.setServiceName(serviceName);
+
+        if (!StringUtil.isEmpty(internalComHost)) {
+            config.setInternalComHost(internalComHost);
+        }
+
+        if (internalComPort > 0) {
+            config.setInternalComPort(internalComPort);
+        }
+
+        provider.prepare();
+        provider.start();
+        provider.notifyAfterCompleted();
+
+        ConsulCoordinator consulCoordinator = (ConsulCoordinator) provider.getService(ClusterRegister.class);
+        // ignore health check
+        ClusterRegister register = new ClusterRegister() {
 
 Review comment:
   ```remoteInstance``` needs to be reassigned

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services