Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
90bb8c6c
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 大约 1 年
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
90bb8c6c
编写于
10月 29, 2018
作者:
G
Gao Hongtao
提交者:
wu-sheng
10月 29, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix k8s api bugs (#1842)
* Update submodule skywalking-ui * Fix k8s api bugs
上级
33c1db4e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
8 deletion
+19
-8
oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/KubernetesCoordinator.java
...rver/cluster/plugin/kubernetes/KubernetesCoordinator.java
+1
-0
oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/dependencies/NamespacedPodListWatch.java
...lugin/kubernetes/dependencies/NamespacedPodListWatch.java
+18
-8
oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
...pache.skywalking.oap.server.library.module.ModuleProvider
+0
-0
未找到文件。
oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/KubernetesCoordinator.java
浏览文件 @
90bb8c6c
...
...
@@ -108,6 +108,7 @@ public class KubernetesCoordinator implements ClusterRegister, ClusterNodesQuery
}
@Override
public
List
<
RemoteInstance
>
queryRemoteNodes
()
{
logger
.
debug
(
"Query kubernetes remote nodes: {}"
,
cache
);
return
Lists
.
newArrayList
(
cache
.
values
());
}
}
oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/dependencies/NamespacedPodListWatch.java
浏览文件 @
90bb8c6c
...
...
@@ -28,10 +28,13 @@ 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.concurrent.TimeUnit
;
import
org.apache.skywalking.oap.server.cluster.plugin.kubernetes.Event
;
import
org.apache.skywalking.oap.server.cluster.plugin.kubernetes.ReusableWatch
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
/**
* Watch the api {@literal https://v1-9.docs.kubernetes.io/docs/reference/generated/kubernetes-api/v1.9/#watch-64}.
...
...
@@ -40,7 +43,7 @@ import org.apache.skywalking.oap.server.cluster.plugin.kubernetes.ReusableWatch;
*/
public
class
NamespacedPodListWatch
implements
ReusableWatch
<
Event
>
{
private
final
CoreV1Api
api
=
new
CoreV1Api
(
);
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
NamespacedPodListWatch
.
class
);
private
final
String
namespace
;
...
...
@@ -65,6 +68,7 @@ public class NamespacedPodListWatch implements ReusableWatch<Event> {
}
client
.
getHttpClient
().
setReadTimeout
(
watchTimeoutSeconds
,
TimeUnit
.
SECONDS
);
Configuration
.
setDefaultApiClient
(
client
);
CoreV1Api
api
=
new
CoreV1Api
();
try
{
watch
=
Watch
.
createWatch
(
client
,
...
...
@@ -72,17 +76,23 @@ public class NamespacedPodListWatch implements ReusableWatch<Event> {
null
,
labelSelector
,
Integer
.
MAX_VALUE
,
null
,
null
,
Boolean
.
TRUE
,
null
,
null
),
new
TypeToken
<
Watch
.
Response
<
V1Pod
>>()
{
}.
getType
());
}
catch
(
ApiException
e
)
{
}
catch
(
final
ApiException
e
)
{
logger
.
error
(
"code:{} header:{} body:{}"
,
e
.
getCode
(),
e
.
getResponseHeaders
(),
e
.
getResponseBody
());
throw
new
RuntimeException
(
e
.
getMessage
(),
e
);
}
}
@Override
public
Iterator
<
Event
>
iterator
()
{
return
Iterators
.
transform
(
watch
.
iterator
(),
response
->
{
if
(
response
==
null
)
{
throw
new
NullPointerException
(
"Original event is null"
);
}
return
new
Event
(
response
.
type
,
response
.
object
.
getMetadata
().
getUid
(),
response
.
object
.
getStatus
().
getPodIP
());
});
try
{
return
Iterators
.
transform
(
watch
.
iterator
(),
response
->
{
if
(
response
==
null
)
{
throw
new
NullPointerException
(
"Original event is null"
);
}
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
();
}
}
oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/resources/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
→
oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/resources/
META-INF/
services/org.apache.skywalking.oap.server.library.module.ModuleProvider
浏览文件 @
90bb8c6c
文件已移动
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录