Skip to content

Commit

Permalink
Support start up with console only mode: step3 - console read cluster…
Browse files Browse the repository at this point in the history
….conf to set remote server members. (#13080)
  • Loading branch information
KomachiSion authored Feb 5, 2025
1 parent 8de4e36 commit 2894eba
Show file tree
Hide file tree
Showing 10 changed files with 163 additions and 34 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
/*
* Copyright 1999-2025 Alibaba Group Holding Ltd.
*
* Licensed 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 com.alibaba.nacos.console.cluster;

import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.console.handler.impl.remote.EnabledRemoteHandler;
import com.alibaba.nacos.core.cluster.Member;
import com.alibaba.nacos.core.cluster.MemberLookup;
import com.alibaba.nacos.core.cluster.NacosMemberManager;
import com.alibaba.nacos.core.cluster.lookup.LookupFactory;
import com.alibaba.nacos.core.utils.Loggers;
import org.springframework.stereotype.Service;

import javax.annotation.PostConstruct;
import java.util.Collection;
import java.util.HashSet;
import java.util.concurrent.ConcurrentSkipListMap;

/**
* Nacos remote server members manager. Only working on console mode to keep and update the remote server members.
*
* @author xiweng.yy
*/
@Service
@EnabledRemoteHandler
public class RemoteServerMemberManager implements NacosMemberManager {

/**
* Nacos remote servers cluster node list.
*/
private volatile ConcurrentSkipListMap<String, Member> serverList;

/**
* Addressing pattern instances.
*/
private MemberLookup lookup;

public RemoteServerMemberManager() {
this.serverList = new ConcurrentSkipListMap<>();
}

@PostConstruct
public void init() throws NacosException {
initAndStartLookup();
}

private void initAndStartLookup() throws NacosException {
this.lookup = LookupFactory.createLookUp();
this.lookup.injectMemberManager(this);
this.lookup.start();
}

@Override
public synchronized boolean memberChange(Collection<Member> members) {
ConcurrentSkipListMap<String, Member> newServerList = new ConcurrentSkipListMap<>();
for (Member each : members) {
newServerList.put(each.getAddress(), each);
}
Loggers.CLUSTER.info("[serverlist] nacos remote server members changed to : {}", newServerList);
this.serverList = newServerList;
return true;
}

@Override
public Collection<Member> allMembers() {
return new HashSet<>(serverList.values());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@

package com.alibaba.nacos.console.handler.impl.remote.core;

import com.alibaba.nacos.console.cluster.RemoteServerMemberManager;
import com.alibaba.nacos.console.handler.core.ClusterHandler;
import com.alibaba.nacos.console.handler.impl.remote.EnabledRemoteHandler;
import com.alibaba.nacos.core.cluster.Member;
import org.springframework.stereotype.Service;

import java.util.Collection;
import java.util.Collections;

/**
* Remote Implementation of ClusterHandler that handles cluster-related operations.
Expand All @@ -33,7 +33,10 @@
@EnabledRemoteHandler
public class ClusterRemoteHandler implements ClusterHandler {

public ClusterRemoteHandler() {
private final RemoteServerMemberManager memberManager;

public ClusterRemoteHandler(RemoteServerMemberManager memberManager) {
this.memberManager = memberManager;
}

/**
Expand All @@ -45,6 +48,6 @@ public ClusterRemoteHandler() {
@Override
public Collection<Member> getNodeList(String ipKeyWord) {
// TODO get from nacos servers
return Collections.emptyList();
return memberManager.allMembers();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ public interface MemberLookup {
/**
* Inject the ServerMemberManager property.
*
* @param memberManager {@link ServerMemberManager}
* @param memberManager {@link NacosMemberManager}
*/
void injectMemberManager(ServerMemberManager memberManager);
void injectMemberManager(NacosMemberManager memberManager);

/**
* The addressing pattern finds cluster nodes.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
* Copyright 1999-2025 Alibaba Group Holding Ltd.
*
* Licensed 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 com.alibaba.nacos.core.cluster;

import com.alibaba.nacos.core.cluster.lookup.AbstractMemberLookup;

import java.util.Collection;

/**
* Nacos member managers.
*
* @author xiweng.yy
*/
public interface NacosMemberManager {

/**
* Nacos members changed, called in {@link AbstractMemberLookup#afterLookup(Collection)}.
*
* @param members new members
* @return {@code true} if changed, {@code false} otherwise
*/
boolean memberChange(Collection<Member> members);

/**
* Get all members.
*
* @return {@link Collection} all member
*/
Collection<Member> allMembers();
}

Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
* @author <a href="mailto:liaochuntao@live.com">liaochuntao</a>
*/
@Component(value = "serverMemberManager")
public class ServerMemberManager {
public class ServerMemberManager implements NacosMemberManager {

private final NacosAsyncRestTemplate asyncRestTemplate = HttpClientBeanHolder.getNacosAsyncRestTemplate(
Loggers.CORE);
Expand All @@ -95,14 +95,10 @@ public class ServerMemberManager {

private static final String SERVER_PORT_PROPERTY = "server.port";

private static final String SPRING_MANAGEMENT_CONTEXT_NAMESPACE = "management";

private static final String MEMBER_CHANGE_EVENT_QUEUE_SIZE_PROPERTY = "nacos.member-change-event.queue.size";

private static final int DEFAULT_MEMBER_CHANGE_EVENT_QUEUE_SIZE = 128;

private static boolean isUseAddressServer = false;

private static final long DEFAULT_TASK_DELAY_TIME = 5_000L;

/**
Expand Down Expand Up @@ -231,7 +227,7 @@ public Class<? extends Event> subscribeType() {

private void initAndStartLookup() throws NacosException {
this.lookup = LookupFactory.createLookUp(this);
isUseAddressServer = this.lookup.useAddressServer();
this.lookup.useAddressServer();
this.lookup.start();
}

Expand All @@ -243,14 +239,10 @@ private void initAndStartLookup() throws NacosException {
*/
public void switchLookup(String name) throws NacosException {
this.lookup = LookupFactory.switchLookup(name, this);
isUseAddressServer = this.lookup.useAddressServer();
this.lookup.useAddressServer();
this.lookup.start();
}

public static boolean isUseAddressServer() {
return isUseAddressServer;
}

/**
* member information update.
*
Expand Down Expand Up @@ -338,6 +330,7 @@ public Member find(String address) {
*
* @return {@link Collection} all member
*/
@Override
public Collection<Member> allMembers() {
// We need to do a copy to avoid affecting the real data
HashSet<Member> set = new HashSet<>(serverList.values());
Expand All @@ -356,7 +349,8 @@ public List<Member> allMembersWithoutSelf() {
return members;
}

synchronized boolean memberChange(Collection<Member> members) {
@Override
public synchronized boolean memberChange(Collection<Member> members) {

if (members == null || members.isEmpty()) {
return false;
Expand Down Expand Up @@ -514,11 +508,6 @@ public void updateMember(Member member) {
serverList.put(member.getAddress(), member);
}

@JustForTest
public void setMemberAddressInfos(Set<String> memberAddressInfos) {
this.memberAddressInfos = memberAddressInfos;
}

@JustForTest
public MemberInfoReportTask getInfoReportTask() {
return infoReportTask;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 1999-2018 Alibaba Group Holding Ltd.
* Copyright 1999-2025 Alibaba Group Holding Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,9 +14,12 @@
* limitations under the License.
*/

package com.alibaba.nacos.core.cluster;
package com.alibaba.nacos.core.cluster.lookup;

import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.core.cluster.Member;
import com.alibaba.nacos.core.cluster.MemberLookup;
import com.alibaba.nacos.core.cluster.NacosMemberManager;

import java.util.Collection;
import java.util.concurrent.atomic.AtomicBoolean;
Expand All @@ -28,12 +31,12 @@
*/
public abstract class AbstractMemberLookup implements MemberLookup {

protected ServerMemberManager memberManager;
protected NacosMemberManager memberManager;

protected AtomicBoolean start = new AtomicBoolean(false);

@Override
public void injectMemberManager(ServerMemberManager memberManager) {
public void injectMemberManager(NacosMemberManager memberManager) {
this.memberManager = memberManager;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import com.alibaba.nacos.common.http.param.Query;
import com.alibaba.nacos.common.model.RestResult;
import com.alibaba.nacos.common.utils.ExceptionUtil;
import com.alibaba.nacos.core.cluster.AbstractMemberLookup;
import com.alibaba.nacos.core.cluster.MemberUtil;
import com.alibaba.nacos.core.utils.GenericType;
import com.alibaba.nacos.core.utils.GlobalExecutor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package com.alibaba.nacos.core.cluster.lookup;

import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.core.cluster.AbstractMemberLookup;
import com.alibaba.nacos.core.cluster.Member;
import com.alibaba.nacos.core.cluster.MemberUtil;
import com.alibaba.nacos.sys.env.EnvUtil;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
import com.alibaba.nacos.common.utils.StringUtils;
import com.alibaba.nacos.core.cluster.MemberLookup;
import com.alibaba.nacos.core.cluster.ServerMemberManager;
import com.alibaba.nacos.sys.env.EnvUtil;
import com.alibaba.nacos.core.utils.Loggers;
import com.alibaba.nacos.sys.env.EnvUtil;

import java.io.File;
import java.util.Arrays;
Expand All @@ -41,6 +41,19 @@ public final class LookupFactory {

private static LookupType currentLookupType = null;

/**
* Create the target addressing pattern.
*
* @return {@link MemberLookup}
* @throws NacosException NacosException
*/
public static MemberLookup createLookUp() throws NacosException {
String lookupType = EnvUtil.getProperty(LOOKUP_MODE_TYPE);
LookupType type = chooseLookup(lookupType);
currentLookupType = type;
return find(type);
}

/**
* Create the target addressing pattern.
*
Expand All @@ -50,10 +63,7 @@ public final class LookupFactory {
*/
public static MemberLookup createLookUp(ServerMemberManager memberManager) throws NacosException {
if (!EnvUtil.getStandaloneMode()) {
String lookupType = EnvUtil.getProperty(LOOKUP_MODE_TYPE);
LookupType type = chooseLookup(lookupType);
LOOK_UP = find(type);
currentLookupType = type;
LOOK_UP = createLookUp();
} else {
LOOK_UP = new StandaloneMemberLookup();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package com.alibaba.nacos.core.cluster.lookup;

import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.core.cluster.AbstractMemberLookup;
import com.alibaba.nacos.core.cluster.MemberUtil;
import com.alibaba.nacos.sys.env.EnvUtil;

Expand Down

0 comments on commit 2894eba

Please sign in to comment.