kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix k8s api connection leak (#1848) 

* Update submodule skywalking-ui

* Fix k8s api bugs

* Fix api connection leak
This commit is contained in:
Gao Hongtao 2018-10-30 16:05:18 +08:00 committed by GitHub
parent f2828e771e
commit 279c81e9fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/KubernetesCoordinator.java
View File

@ -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":

41
oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/dependencies/NamespacedPodListWatch.java
View File

@ -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;
}
};
}
}