Skip to content

Commit 67e70cd

Browse files
committed
feat:support auth.
1 parent eb34cc1 commit 67e70cd

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

polaris-plugins/polaris-plugins-connector/connector-common/src/main/java/com/tencent/polaris/plugins/connector/common/DestroyableServerConnector.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@
2323
import com.tencent.polaris.api.pojo.Services;
2424
import com.tencent.polaris.logging.LoggerFactory;
2525
import com.tencent.polaris.plugins.connector.common.constant.ServiceUpdateTaskConstant.Status;
26+
import org.slf4j.Logger;
27+
2628
import java.util.Map;
2729
import java.util.concurrent.ConcurrentHashMap;
28-
import org.slf4j.Logger;
2930

3031
/**
3132
* Destroyable server connector.
@@ -52,7 +53,7 @@ public abstract class DestroyableServerConnector extends Destroyable implements
5253
*/
5354
public void retryServiceUpdateTask(ServiceUpdateTask updateTask) {
5455
LOG.info("[ServerConnector]retry schedule task for {}, retry delay {}", updateTask, TASK_RETRY_INTERVAL_MS);
55-
updateTask.setStatus(Status.RUNNING, Status.READY);
56+
updateTask.setStatus(Status.RUNNING, Status.READY, true);
5657
if (isDestroyed()) {
5758
return;
5859
}

polaris-plugins/polaris-plugins-connector/connector-common/src/main/java/com/tencent/polaris/plugins/connector/common/ServiceUpdateTask.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,14 @@ public boolean setType(Type last, Type current) {
8383
return taskType.compareAndSet(last, current);
8484
}
8585

86-
public boolean setStatus(Status last, Status current) {
86+
public boolean setStatus(Status last, Status current, boolean isSpread) {
8787
return taskStatus.compareAndSet(last, current);
8888
}
8989

90+
public boolean setStatus(Status last, Status current) {
91+
return setStatus(last, current, false);
92+
}
93+
9094
public void setLastUpdateTime(long currentTime) {
9195
lastUpdateTime.set(currentTime);
9296
}

polaris-plugins/polaris-plugins-connector/connector-composite/src/main/java/com/tencent/polaris/plugins/connector/composite/CompositeServiceUpdateTask.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ public void execute() {
113113
entry.getValue().execute(this);
114114
}
115115
}
116-
// TODO 全部规则实现完后改成StringUtils.equals(mainConnectorType, SERVER_CONNECTOR_CONSUL)
117116
if (ifMainConnectorTypeSet && isServiceUpdateTaskExecuted
118117
&& (StringUtils.equals(mainConnectorType, SERVER_CONNECTOR_GRPC)
119118
|| (serviceEventKey.getEventType().equals(EventType.INSTANCE)
@@ -408,6 +407,15 @@ public boolean notifyServerEvent(ServerEvent serverEvent) {
408407
return svcDeleted;
409408
}
410409

410+
public boolean setStatus(Status last, Status current, boolean isSpread) {
411+
if (isSpread) {
412+
for (Map.Entry<String, ServiceUpdateTask> entry : subServiceUpdateTaskMap.entrySet()) {
413+
entry.getValue().setStatus(last, current);
414+
}
415+
}
416+
return taskStatus.compareAndSet(last, current);
417+
}
418+
411419
private boolean canExecute(String connectorType, ServiceUpdateTask serviceUpdateTask) {
412420
boolean canConnectorExecute = StringUtils.equalsIgnoreCase(mainConnectorType, connectorType)
413421
|| serviceEventKey.getEventType().equals(EventType.INSTANCE)

0 commit comments

Comments
 (0)