[GitHub] xuyiyun0929 commented on a change in pull request #678: [SCB-506]服务治理相关的需要事件上报
xuyiyun0929 commented on a change in pull request #678: [SCB-506]服务治理相关的需要事件上报
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/678#discussion_r195614690
##
File path:
handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/CustomizeCommandGroupKey.java
##
@@ -0,0 +1,73 @@
+/*
+ * 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.servicecomb.bizkeeper;
+
+import org.apache.servicecomb.core.Invocation;
+
+import com.netflix.hystrix.HystrixCommandGroupKey;
+import com.netflix.hystrix.HystrixKey;
+import com.netflix.hystrix.util.InternMap;
+
+public class CustomizeCommandGroupKey extends HystrixKey.HystrixKeyDefault
implements HystrixCommandGroupKey {
+
+ private String invocationType;
+
+ private String microserviceName;
+
+ private String schema;
+
+ private String operation;
+
+ public CustomizeCommandGroupKey(Invocation invocation) {
+super(invocation.getInvocationType().name() + "." +
invocation.getOperationMeta().getMicroserviceQualifiedName());
+this.invocationType = invocation.getInvocationType().name();
+this.microserviceName = invocation.getMicroserviceName();
+this.schema = invocation.getSchemaId();
+this.operation = invocation.getOperationName();
+ }
+
+ private static final InternMap intern =
+ new InternMap(
+ new InternMap.ValueConstructor() {
+@Override
+public CustomizeCommandGroupKey create(Invocation invocation) {
+ return new CustomizeCommandGroupKey(invocation);
+}
+ });
+
+
+ public static HystrixCommandGroupKey asKey(String type, Invocation
invocation) {
+return intern.interned(invocation);
Review comment:
Submitted code resolved.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] xuyiyun0929 commented on a change in pull request #678: [SCB-506]服务治理相关的需要事件上报
xuyiyun0929 commented on a change in pull request #678: [SCB-506]服务治理相关的需要事件上报
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/678#discussion_r195614463
##
File path:
handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/event/CircutBreakerEvent.java
##
@@ -0,0 +1,112 @@
+/*
+ * 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.servicecomb.bizkeeper.event;
+
+
+import org.apache.servicecomb.bizkeeper.CustomizeCommandGroupKey;
+import org.apache.servicecomb.foundation.common.event.AlarmEvent;
+
+import com.netflix.hystrix.HystrixCommandKey;
+import com.netflix.hystrix.HystrixCommandMetrics;
+
+public class CircutBreakerEvent extends AlarmEvent {
+
+ private String role;
+
+ private String microservice;
+
+ private String schema;
+
+ private String operation;
+
+ //当前总请求数
+ private long currentTotalRequest;
+
+ //当前请求出错计数
+ private long currentErrorCount;
+
+ //当前请求出错百分比
+ private long currentErrorPercentage;
+
+ private int requestVolumeThreshold;
+
+ private int sleepWindowInMilliseconds;
+
+ private int errorThresholdPercentage;
+
+ public CircutBreakerEvent(HystrixCommandKey commandKey, Type type) {
+super(type);
+HystrixCommandMetrics hystrixCommandMetrics =
+HystrixCommandMetrics.getInstance(commandKey);
+if (hystrixCommandMetrics != null) {
+ CustomizeCommandGroupKey customizeCommandGroupKey =
+ (CustomizeCommandGroupKey) hystrixCommandMetrics.getCommandGroup();
Review comment:
done
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] xuyiyun0929 commented on a change in pull request #678: [SCB-506]服务治理相关的需要事件上报
xuyiyun0929 commented on a change in pull request #678: [SCB-506]服务治理相关的需要事件上报
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/678#discussion_r195613419
##
File path:
handlers/handler-bizkeeper/src/test/java/org/apache/servicecomb/bizkeeper/TestCustomCommandGroupKey.java
##
@@ -0,0 +1,45 @@
+/*
+ * 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.servicecomb.bizkeeper;
+
+import org.apache.servicecomb.core.Invocation;
+import org.apache.servicecomb.core.definition.OperationMeta;
+import org.apache.servicecomb.swagger.invocation.InvocationType;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class TestCustomCommandGroupKey {
+ @Test
+ public void testToHystrixCommandGroupKey() {
+
+Invocation invocation = Mockito.mock(Invocation.class);
+
Mockito.when(invocation.getOperationMeta()).thenReturn(Mockito.mock(OperationMeta.class));
+
Mockito.when(invocation.getOperationMeta().getMicroserviceQualifiedName()).thenReturn("test2");
+
Mockito.when(invocation.getMicroserviceName()).thenReturn("microserviceName");
+
Mockito.when(invocation.getInvocationType()).thenReturn(InvocationType.CONSUMER);
+Mockito.when(invocation.getSchemaId()).thenReturn("schemaId");
+Mockito.when(invocation.getOperationName()).thenReturn("operationName");
+CustomizeCommandGroupKey customizeCommandGroupKey =
+(CustomizeCommandGroupKey) CustomizeCommandGroupKey.asKey("type",
invocation);
+Assert.assertEquals("CONSUMER",
customizeCommandGroupKey.getInvocationType());
+Assert.assertEquals("microserviceName",
customizeCommandGroupKey.getMicroserviceName());
+Assert.assertEquals("schemaId", customizeCommandGroupKey.getSchema());
+Assert.assertEquals("operationName",
customizeCommandGroupKey.getOperation());
Review comment:
done
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] xuyiyun0929 commented on a change in pull request #678: [SCB-506]服务治理相关的需要事件上报
xuyiyun0929 commented on a change in pull request #678: [SCB-506]服务治理相关的需要事件上报
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/678#discussion_r194279099
##
File path:
handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filter/IsolationServerListFilter.java
##
@@ -91,19 +94,20 @@ private boolean allowVisit(Server server) {
ServerStats serverStats = stats.getSingleServerStat(server);
long totalRequest = serverStats.getTotalRequestsCount();
long failureRequest = serverStats.getSuccessiveConnectionFailureCount();
-
+int currentCountinuousFailureCount = ((CseServer)
server).getCountinuousFailureCount();
Review comment:
done. Calculate currentErrorThresholdPercentage after the conditions are met
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] xuyiyun0929 commented on a change in pull request #678: [SCB-506]服务治理相关的需要事件上报
xuyiyun0929 commented on a change in pull request #678: [SCB-506]服务治理相关的需要事件上报
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/678#discussion_r194277099
##
File path:
handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/event/CircutBreakerEventNotifier.java
##
@@ -0,0 +1,61 @@
+/*
+ * 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.servicecomb.bizkeeper.event;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.apache.servicecomb.foundation.common.event.EventManager;
+import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
+import org.apache.servicecomb.foundation.common.event.AlarmEvent.Type;
+
+import com.netflix.hystrix.HystrixCommandKey;
+import com.netflix.hystrix.HystrixEventType;
+import com.netflix.hystrix.strategy.eventnotifier.HystrixEventNotifier;
+
+public class CircutBreakerEventNotifier extends HystrixEventNotifier {
+
+ /**
+ * 使用circuitFlag来记录被熔断的接口
+ */
+ private ConcurrentHashMapEx circuitFlag = new
ConcurrentHashMapEx<>();
+
+ public EventManager eventManager = new EventManager();
+
+ @SuppressWarnings("static-access")
Review comment:
Avoid using global instances directly with EventManager.getEventBus()：
EventBus eventBus = EventManager.getEventBus();
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] xuyiyun0929 commented on a change in pull request #678: [SCB-506]服务治理相关的需要事件上报
xuyiyun0929 commented on a change in pull request #678: [SCB-506]服务治理相关的需要事件上报
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/678#discussion_r194276834
##
File path:
handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/event/CircutBreakerEvent.java
##
@@ -0,0 +1,109 @@
+/*
+ * 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.servicecomb.bizkeeper.event;
+
+import org.apache.servicecomb.foundation.common.event.AlarmEvent;
+
+import com.netflix.hystrix.HystrixCommandKey;
+import com.netflix.hystrix.HystrixCommandMetrics;
+
+public class CircutBreakerEvent extends AlarmEvent {
+
+ private String role;
+
+ private String microservice;
+
+ private String schema;
+
+ private String operation;
+
+ //当前总请求数
+ private long currentTotalRequest;
+
+ //当前请求出错计数
+ private long currentErrorCount;
+
+ //当前请求出错百分比
+ private long currentErrorPercentage;
+
+ private int requestVolumeThreshold;
+
+ private int sleepWindowInMilliseconds;
+
+ private int errorThresholdPercentage;
+
+ public CircutBreakerEvent(HystrixCommandKey commandKey, Type type) {
+super(type);
+HystrixCommandMetrics hystrixCommandMetrics =
+HystrixCommandMetrics.getInstance(commandKey);
+String[] arrayKey = commandKey.name().split("\\.");
Review comment:
done
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] xuyiyun0929 commented on a change in pull request #678: [SCB-506]服务治理相关的需要事件上报
xuyiyun0929 commented on a change in pull request #678: [SCB-506]服务治理相关的需要事件上报
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/678#discussion_r190457961
##
File path:
handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/event/CircutBreakerEventNotifier.java
##
@@ -0,0 +1,61 @@
+/*
+ * 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.servicecomb.bizkeeper.event;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.apache.servicecomb.foundation.common.event.EventManager;
+import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
+import org.apache.servicecomb.foundation.common.event.AlarmEvent.Type;
+
+import com.netflix.hystrix.HystrixCommandKey;
+import com.netflix.hystrix.HystrixEventType;
+import com.netflix.hystrix.strategy.eventnotifier.HystrixEventNotifier;
+
+public class CircutBreakerEventNotifier extends HystrixEventNotifier {
+
+ /**
+ * 使用circuitFlag来记录被熔断的接口
+ */
+ private ConcurrentHashMapEx circuitFlag = new
ConcurrentHashMapEx<>();
+
+ public EventManager eventManager = new EventManager();
+
+ @SuppressWarnings("static-access")
+ @Override
+ public synchronized void markEvent(HystrixEventType eventType,
HystrixCommandKey key) {
Review comment:
Mistake, I will remove it
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] xuyiyun0929 commented on a change in pull request #678: [SCB-506]服务治理相关的需要事件上报
xuyiyun0929 commented on a change in pull request #678: [SCB-506]服务治理相关的需要事件上报
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/678#discussion_r189149707
##
File path:
handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filter/IsolationServerListFilter.java
##
@@ -112,10 +116,18 @@ private boolean allowVisit(Server server) {
LOGGER.info("The Service {}'s instance {} has been break, will give a
single test opportunity.",
microserviceName,
server);
+ EventManager.post(new IsolationServerEvent(microserviceName,
totalRequest, currentCountinuousFailureCount,
Review comment:
done.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] xuyiyun0929 commented on a change in pull request #678: [SCB-506]服务治理相关的需要事件上报
xuyiyun0929 commented on a change in pull request #678: [SCB-506]服务治理相关的需要事件上报
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/678#discussion_r189147665
##
File path:
handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/filter/TestIsolationServerListFilter.java
##
@@ -60,29 +63,26 @@ public static void classTeardown() {
Deencapsulation.setField(ConfigurationManager.class, "instance", null);
Deencapsulation.setField(ConfigurationManager.class,
"customConfigurationInstalled", false);
Deencapsulation.setField(DynamicPropertyFactory.class, "config", null);
+ArchaiusUtils.resetConfig();
Review comment:
done,removed other reflections.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] xuyiyun0929 commented on a change in pull request #678: [SCB-506]服务治理相关的需要事件上报
xuyiyun0929 commented on a change in pull request #678: [SCB-506]服务治理相关的需要事件上报
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/678#discussion_r189147962
##
File path:
handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/filter/TestIsolationServerListFilter.java
##
@@ -60,29 +63,26 @@ public static void classTeardown() {
Deencapsulation.setField(ConfigurationManager.class, "instance", null);
Deencapsulation.setField(ConfigurationManager.class,
"customConfigurationInstalled", false);
Deencapsulation.setField(DynamicPropertyFactory.class, "config", null);
+ArchaiusUtils.resetConfig();
}
@Before
public void setUp() throws Exception {
IsolationServerListFilter = new IsolationServerListFilter();
loadBalancerStats = new LoadBalancerStats("loadBalancer");
-
-AbstractConfiguration configuration =
-(AbstractConfiguration)
DynamicPropertyFactory.getBackingConfigurationSource();
-configuration.clearProperty("cse.loadbalance.isolation.enabled");
-configuration.addProperty("cse.loadbalance.isolation.enabled",
+ArchaiusUtils.setProperty("cse.loadbalance.isolation.enabled",
"true");
-
configuration.clearProperty("cse.loadbalance.isolation.enableRequestThreshold");
-
configuration.addProperty("cse.loadbalance.isolation.enableRequestThreshold",
+
ArchaiusUtils.setProperty("cse.loadbalance.isolation.enableRequestThreshold",
"3");
taskList = new ArrayList<>();
-EventManager.register(new Object() {
+receiveEvent = new Object() {
@Subscribe
public void onEvent(AlarmEvent isolationServerEvent) {
taskList.add(isolationServerEvent);
}
-});
+};
+EventManager.register(receiveEvent);
Review comment:
done,save a reference in filter when UT create a new instance for it.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] xuyiyun0929 commented on a change in pull request #678: [SCB-506]服务治理相关的需要事件上报
xuyiyun0929 commented on a change in pull request #678: [SCB-506]服务治理相关的需要事件上报
URL:
https://github.com/apache/incubator-servicecomb-java-chassis/pull/678#discussion_r189147432
##
File path:
handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/event/CircutBreakerEventNotifier.java
##
@@ -0,0 +1,58 @@
+/*
+ * 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.servicecomb.bizkeeper.event;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.servicecomb.foundation.common.event.EventManager;
+import org.apache.servicecomb.foundation.common.event.AlarmEvent.Type;
+
+import com.netflix.hystrix.HystrixCommandKey;
+import com.netflix.hystrix.HystrixEventType;
+import com.netflix.hystrix.strategy.eventnotifier.HystrixEventNotifier;
+
+public class CircutBreakerEventNotifier extends HystrixEventNotifier {
+
+ /**
+ * 使用circuitMarker来记录被熔断的接口
+ */
+ private static ConcurrentHashMap circuitMarker = new
ConcurrentHashMap<>();
+
+ @Override
+ public void markEvent(HystrixEventType eventType, HystrixCommandKey key) {
+String keyName = key.name();
+switch (eventType) {
+ case SHORT_CIRCUITED:
+if (circuitMarker.get(keyName) == null) {
Review comment:
Succeeded/failed is not used and has been deleted. Open/close is used to
indicate circuit and isolation status.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
