Skip to content

Commit 186bf21

Browse files
committed
修复bug
1 parent 5dccfc2 commit 186bf21

File tree

4 files changed

+5
-5
lines changed
  • spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/ribbon
  • spring-cloud-gray-samples

4 files changed

+5
-5
lines changed

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/ribbon/GrayLoadBalanceRule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public Server choose(Object key) {
6161
GrayService grayService = grayManager.getGrayService(serviceId);
6262
List<Server> servers = lb.getAllServers();
6363
List<Server> grayServers = new ArrayList<>(grayService.getGrayInstances().size());
64-
List<Server> normalServers = new ArrayList<>(servers.size() - grayService.getGrayInstances().size());
64+
List<Server> normalServers = new ArrayList<>(Math.min(servers.size(), grayService.getGrayInstances().size()));
6565

6666
for (Server server : servers) {
6767
// ServerSpec serverSpec = serverExplainer.apply(server);

spring-cloud-gray-samples/spring-cloud-gray-service-a-sample/src/main/resources/config/application.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ eureka:
1616
gray:
1717
client:
1818
instance:
19-
grayEnroll: true #是否在启动后自动注册成灰度实例
19+
grayEnroll: false #是否在启动后自动注册成灰度实例
2020
serverUrl: http://localhost:20202 #灰度服务端的url

spring-cloud-gray-samples/spring-cloud-gray-service-b-sample/src/main/resources/config/application.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ eureka:
3838
instanceId: ${spring.application.name}:${server.port}
3939
lease-renewal-interval-in-seconds: 10
4040
lease-expiration-duration-in-seconds: 30
41-
initial-status: starting
41+
# initial-status: starting
4242
feign:
4343
hystrix:
4444
enabled: true
@@ -60,7 +60,7 @@ gray:
6060
value: version,test
6161
path-patterns: /*
6262
load:
63-
enabled: true
63+
enabled: false
6464
gray-instances:
6565
- serviceId: service-a
6666
instance-id: service-a:20104

spring-cloud-gray-samples/spring-cloud-gray-zuul-sample/src/main/resources/config/application.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ eureka:
3434
instance:
3535
lease-renewal-interval-in-seconds: 10
3636
lease-expiration-duration-in-seconds: 30
37-
initial-status: starting
37+
# initial-status: starting
3838

3939
ribbon:
4040
# ReadTimeout: 30000

0 commit comments

Comments
 (0)