You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2018/10/30 07:24:13 UTC
[incubator-skywalking] branch fix/k8s created (now c89f6b1)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch fix/k8s
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
at c89f6b1 Fix api connection leak
This branch includes the following new commits:
new 9604a89 Merge remote-tracking branch 'origin/master'
new 9aa0e1b Merge branch 'master' into fix/k8s
new c89f6b1 Fix api connection leak
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-skywalking] 01/03: Merge remote-tracking branch
'origin/master'
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch fix/k8s
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 9604a8931eb0b9839fede58ad66c5b117ca11edd
Merge: 478d502 f2828e7
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Tue Oct 30 14:43:11 2018 +0800
Merge remote-tracking branch 'origin/master'
docker/config/alarm-settings.yml | 46 +++
docker/config/component-libraries.yml | 270 ++++++++++++++++
docs/en/setup/backend/backend-k8s.md | 6 +-
docs/en/setup/istio/README.md | 18 ++
kubernetes/elasticsearch/01-storageclass.yml | 25 --
kubernetes/elasticsearch/02-service.yml | 32 --
kubernetes/elasticsearch/03-statefulset.yml | 117 -------
kubernetes/istio/01-metrictemplete.yml | 24 --
kubernetes/istio/02-skywalingadapter.yml | 26 --
kubernetes/istio/03-operator_cfg.yml | 63 ----
kubernetes/namespace.yml | 22 --
kubernetes/oap/00-rbac.yml | 41 ---
kubernetes/oap/01-config.yml | 338 ---------------------
kubernetes/oap/01-service.yml | 31 --
kubernetes/oap/02-deployment.yml | 59 ----
.../plugin/kubernetes/KubernetesCoordinator.java | 1 +
.../dependencies/NamespacedPodListWatch.java | 26 +-
...alking.oap.server.library.module.ModuleProvider | 0
.../plugin/zookeeper/ZookeeperCoordinator.java | 40 ++-
.../oap/server/core/CoreModuleConfig.java | 2 +
.../oap/server/core/CoreModuleProvider.java | 60 +++-
.../oap/server/core/alarm/AlarmMeta.java | 3 +-
.../core/analysis/generated/all/AllDispatcher.java | 2 +-
.../generated/all/AllHeatmapIndicator.java | 13 +-
.../analysis/generated/all/AllP50Indicator.java | 13 +-
.../analysis/generated/all/AllP75Indicator.java | 13 +-
.../analysis/generated/all/AllP90Indicator.java | 13 +-
.../analysis/generated/all/AllP95Indicator.java | 13 +-
.../analysis/generated/all/AllP99Indicator.java | 13 +-
.../generated/endpoint/EndpointAvgIndicator.java | 23 +-
.../generated/endpoint/EndpointCpmIndicator.java | 21 +-
.../generated/endpoint/EndpointDispatcher.java | 2 +-
.../generated/endpoint/EndpointP50Indicator.java | 21 +-
.../generated/endpoint/EndpointP75Indicator.java | 21 +-
.../generated/endpoint/EndpointP90Indicator.java | 21 +-
.../generated/endpoint/EndpointP95Indicator.java | 21 +-
.../generated/endpoint/EndpointP99Indicator.java | 21 +-
.../generated/endpoint/EndpointSlaIndicator.java | 23 +-
.../EndpointRelationCpmIndicator.java | 25 +-
.../EndpointRelationDispatcher.java | 2 +-
.../EndpointRelationRespTimeIndicator.java | 27 +-
.../generated/service/ServiceCpmIndicator.java | 17 +-
.../generated/service/ServiceDispatcher.java | 2 +-
.../generated/service/ServiceP50Indicator.java | 17 +-
.../generated/service/ServiceP75Indicator.java | 17 +-
.../generated/service/ServiceP90Indicator.java | 17 +-
.../generated/service/ServiceP95Indicator.java | 17 +-
.../generated/service/ServiceP99Indicator.java | 17 +-
.../service/ServiceRespTimeIndicator.java | 19 +-
.../generated/service/ServiceSlaIndicator.java | 19 +-
.../ServiceInstanceCpmIndicator.java | 19 +-
.../serviceinstance/ServiceInstanceDispatcher.java | 2 +-
.../ServiceInstanceRespTimeIndicator.java | 21 +-
.../InstanceJvmCpuIndicator.java | 21 +-
.../ServiceInstanceJVMCPUDispatcher.java | 2 +-
.../InstanceJvmOldGcCountIndicator.java | 17 +-
.../InstanceJvmOldGcTimeIndicator.java | 21 +-
.../InstanceJvmYoungGcCountIndicator.java | 17 +-
.../InstanceJvmYoungGcTimeIndicator.java | 21 +-
.../ServiceInstanceJVMGCDispatcher.java | 2 +-
.../InstanceJvmMemoryHeapIndicator.java | 21 +-
.../InstanceJvmMemoryHeapMaxIndicator.java | 21 +-
.../InstanceJvmMemoryNoheapIndicator.java | 21 +-
.../InstanceJvmMemoryNoheapMaxIndicator.java | 21 +-
.../ServiceInstanceJVMMemoryDispatcher.java | 4 +-
.../ServiceInstanceJVMMemoryPoolDispatcher.java | 2 +-
.../ServiceInstanceRelationDispatcher.java | 2 +-
.../ServiceRelationClientCallSlaIndicator.java | 19 +-
.../ServiceRelationClientCpmIndicator.java | 17 +-
.../ServiceRelationClientRespTimeIndicator.java | 19 +-
.../servicerelation/ServiceRelationDispatcher.java | 2 +-
.../ServiceRelationServerCallSlaIndicator.java | 19 +-
.../ServiceRelationServerCpmIndicator.java | 17 +-
.../ServiceRelationServerRespTimeIndicator.java | 19 +-
.../core/analysis/indicator/PercentIndicator.java | 2 +-
.../EndpointRelationServerSideIndicator.java | 13 +-
.../ServiceRelationClientSideIndicator.java | 13 +-
.../ServiceRelationServerSideIndicator.java | 13 +-
.../oap/server/core/cluster/RemoteInstance.java | 2 +-
.../oap/server/core/query/MetricQueryService.java | 5 +
.../server/core/register/EndpointInventory.java | 22 +-
.../core/register/NetworkAddressInventory.java | 11 +-
.../core/register/ServiceInstanceInventory.java | 42 ++-
.../oap/server/core/register/ServiceInventory.java | 17 +-
.../core/remote/client/GRPCRemoteClient.java | 1 +
.../core/remote/client/RemoteClientManager.java | 25 +-
.../analysis/indicator/PercentIndicatorTest.java | 6 +-
.../oap/server/library/server/grpc/GRPCServer.java | 13 +
.../oap/server/library/util/StringUtils.java | 4 +
.../receiver/mesh/TelemetryDataDispatcher.java | 2 +-
.../elasticsearch/query/MetadataQueryEsDAO.java | 2 +
skywalking-ui | 2 +-
92 files changed, 925 insertions(+), 1317 deletions(-)
[incubator-skywalking] 03/03: Fix api connection leak
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch fix/k8s
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit c89f6b1e82ba4fdc69d6948a380736ff58aca802
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Tue Oct 30 15:23:30 2018 +0800
Fix api connection leak
---
.../plugin/kubernetes/KubernetesCoordinator.java | 3 ++
.../dependencies/NamespacedPodListWatch.java | 41 +++++++++++++++-------
2 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/KubernetesCoordinator.java b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/KubernetesCoordinator.java
index ae8ef01..5c3e72f 100644
--- a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/KubernetesCoordinator.java
+++ b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/KubernetesCoordinator.java
@@ -92,6 +92,9 @@ public class KubernetesCoordinator implements ClusterRegister, ClusterNodesQuery
private void generateRemoteNodes() {
for (Event event : watch) {
+ if (event == null) {
+ break;
+ }
logger.debug("Received event {} {}-{}", event.getType(), event.getUid(), event.getHost());
switch (event.getType()) {
case "ADDED":
diff --git a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/dependencies/NamespacedPodListWatch.java b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/dependencies/NamespacedPodListWatch.java
index 3fbcae8..985deae 100644
--- a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/dependencies/NamespacedPodListWatch.java
+++ b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/dependencies/NamespacedPodListWatch.java
@@ -18,7 +18,6 @@
package org.apache.skywalking.oap.server.cluster.plugin.kubernetes.dependencies;
-import com.google.common.collect.Iterators;
import com.google.common.reflect.TypeToken;
import io.kubernetes.client.ApiClient;
import io.kubernetes.client.ApiException;
@@ -28,9 +27,10 @@ import io.kubernetes.client.models.V1Pod;
import io.kubernetes.client.util.Config;
import io.kubernetes.client.util.Watch;
import java.io.IOException;
-import java.util.Collections;
import java.util.Iterator;
+import java.util.Objects;
import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
import org.apache.skywalking.oap.server.cluster.plugin.kubernetes.Event;
import org.apache.skywalking.oap.server.cluster.plugin.kubernetes.ReusableWatch;
import org.slf4j.Logger;
@@ -83,16 +83,33 @@ public class NamespacedPodListWatch implements ReusableWatch<Event> {
}
@Override public Iterator<Event> iterator() {
- try {
- return Iterators.transform(watch.iterator(), response -> {
- if (response == null) {
- throw new NullPointerException("Original event is null");
+ final Iterator<Watch.Response<V1Pod>> watchItr = watch.iterator();
+ return new Iterator<Event>() {
+ @Override public boolean hasNext() {
+ return wrap(watchItr::hasNext, false);
+ }
+
+ @Override public Event next() {
+ return wrap(() -> {
+ final Watch.Response<V1Pod> response = watchItr.next();
+ return new Event(response.type, response.object.getMetadata().getUid(), response.object.getStatus().getPodIP());
+ }, null);
+ }
+
+ private <R> R wrap(final Supplier<R> action, final R defaultValue) {
+ Objects.requireNonNull(action);
+ try {
+ return action.get();
+ } catch (final Throwable t) {
+ logger.trace("Throwable", t);
+ try {
+ watch.close();
+ } catch (IOException e) {
+ logger.error("Close watch error", e);
+ }
}
- return new Event(response.type, response.object.getMetadata().getUid(), response.object.getStatus().getPodIP());
- });
- } catch (final RuntimeException exp) {
- logger.trace("Runtime exception", exp);
- }
- return Collections.emptyIterator();
+ return defaultValue;
+ }
+ };
}
}
[incubator-skywalking] 02/03: Merge branch 'master' into fix/k8s
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch fix/k8s
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 9aa0e1b3fd04ed45a8c80695d789d9af24c5f262
Merge: 6c29b0f 9604a89
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Tue Oct 30 15:22:53 2018 +0800
Merge branch 'master' into fix/k8s
docker/config/alarm-settings.yml | 46 +++
docker/config/component-libraries.yml | 270 ++++++++++++++++
docs/en/setup/backend/backend-k8s.md | 6 +-
docs/en/setup/istio/README.md | 18 ++
kubernetes/elasticsearch/01-storageclass.yml | 25 --
kubernetes/elasticsearch/02-service.yml | 32 --
kubernetes/elasticsearch/03-statefulset.yml | 117 -------
kubernetes/istio/01-metrictemplete.yml | 24 --
kubernetes/istio/02-skywalingadapter.yml | 26 --
kubernetes/istio/03-operator_cfg.yml | 63 ----
kubernetes/namespace.yml | 22 --
kubernetes/oap/00-rbac.yml | 41 ---
kubernetes/oap/01-config.yml | 338 ---------------------
kubernetes/oap/01-service.yml | 31 --
kubernetes/oap/02-deployment.yml | 59 ----
.../plugin/zookeeper/ZookeeperCoordinator.java | 40 ++-
.../oap/server/core/CoreModuleConfig.java | 2 +
.../oap/server/core/CoreModuleProvider.java | 60 +++-
.../oap/server/core/alarm/AlarmMeta.java | 3 +-
.../core/analysis/generated/all/AllDispatcher.java | 2 +-
.../generated/all/AllHeatmapIndicator.java | 13 +-
.../analysis/generated/all/AllP50Indicator.java | 13 +-
.../analysis/generated/all/AllP75Indicator.java | 13 +-
.../analysis/generated/all/AllP90Indicator.java | 13 +-
.../analysis/generated/all/AllP95Indicator.java | 13 +-
.../analysis/generated/all/AllP99Indicator.java | 13 +-
.../generated/endpoint/EndpointAvgIndicator.java | 23 +-
.../generated/endpoint/EndpointCpmIndicator.java | 21 +-
.../generated/endpoint/EndpointDispatcher.java | 2 +-
.../generated/endpoint/EndpointP50Indicator.java | 21 +-
.../generated/endpoint/EndpointP75Indicator.java | 21 +-
.../generated/endpoint/EndpointP90Indicator.java | 21 +-
.../generated/endpoint/EndpointP95Indicator.java | 21 +-
.../generated/endpoint/EndpointP99Indicator.java | 21 +-
.../generated/endpoint/EndpointSlaIndicator.java | 23 +-
.../EndpointRelationCpmIndicator.java | 25 +-
.../EndpointRelationDispatcher.java | 2 +-
.../EndpointRelationRespTimeIndicator.java | 27 +-
.../generated/service/ServiceCpmIndicator.java | 17 +-
.../generated/service/ServiceDispatcher.java | 2 +-
.../generated/service/ServiceP50Indicator.java | 17 +-
.../generated/service/ServiceP75Indicator.java | 17 +-
.../generated/service/ServiceP90Indicator.java | 17 +-
.../generated/service/ServiceP95Indicator.java | 17 +-
.../generated/service/ServiceP99Indicator.java | 17 +-
.../service/ServiceRespTimeIndicator.java | 19 +-
.../generated/service/ServiceSlaIndicator.java | 19 +-
.../ServiceInstanceCpmIndicator.java | 19 +-
.../serviceinstance/ServiceInstanceDispatcher.java | 2 +-
.../ServiceInstanceRespTimeIndicator.java | 21 +-
.../InstanceJvmCpuIndicator.java | 21 +-
.../ServiceInstanceJVMCPUDispatcher.java | 2 +-
.../InstanceJvmOldGcCountIndicator.java | 17 +-
.../InstanceJvmOldGcTimeIndicator.java | 21 +-
.../InstanceJvmYoungGcCountIndicator.java | 17 +-
.../InstanceJvmYoungGcTimeIndicator.java | 21 +-
.../ServiceInstanceJVMGCDispatcher.java | 2 +-
.../InstanceJvmMemoryHeapIndicator.java | 21 +-
.../InstanceJvmMemoryHeapMaxIndicator.java | 21 +-
.../InstanceJvmMemoryNoheapIndicator.java | 21 +-
.../InstanceJvmMemoryNoheapMaxIndicator.java | 21 +-
.../ServiceInstanceJVMMemoryDispatcher.java | 4 +-
.../ServiceInstanceJVMMemoryPoolDispatcher.java | 2 +-
.../ServiceInstanceRelationDispatcher.java | 2 +-
.../ServiceRelationClientCallSlaIndicator.java | 19 +-
.../ServiceRelationClientCpmIndicator.java | 17 +-
.../ServiceRelationClientRespTimeIndicator.java | 19 +-
.../servicerelation/ServiceRelationDispatcher.java | 2 +-
.../ServiceRelationServerCallSlaIndicator.java | 19 +-
.../ServiceRelationServerCpmIndicator.java | 17 +-
.../ServiceRelationServerRespTimeIndicator.java | 19 +-
.../core/analysis/indicator/PercentIndicator.java | 2 +-
.../EndpointRelationServerSideIndicator.java | 13 +-
.../ServiceRelationClientSideIndicator.java | 13 +-
.../ServiceRelationServerSideIndicator.java | 13 +-
.../oap/server/core/cluster/RemoteInstance.java | 2 +-
.../oap/server/core/query/MetricQueryService.java | 5 +
.../server/core/register/EndpointInventory.java | 22 +-
.../core/register/NetworkAddressInventory.java | 11 +-
.../core/register/ServiceInstanceInventory.java | 42 ++-
.../oap/server/core/register/ServiceInventory.java | 17 +-
.../core/remote/client/GRPCRemoteClient.java | 1 +
.../core/remote/client/RemoteClientManager.java | 25 +-
.../analysis/indicator/PercentIndicatorTest.java | 6 +-
.../oap/server/library/server/grpc/GRPCServer.java | 13 +
.../oap/server/library/util/StringUtils.java | 4 +
.../receiver/mesh/TelemetryDataDispatcher.java | 2 +-
.../elasticsearch/query/MetadataQueryEsDAO.java | 2 +
skywalking-ui | 2 +-
89 files changed, 906 insertions(+), 1309 deletions(-)