Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
5e40a099
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,发现更多精彩内容 >>
未验证
提交
5e40a099
编写于
5月 15, 2021
作者:
J
Joe
提交者:
GitHub
5月 15, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix issue 6945 (#6948)
上级
86dab083
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
15 addition
and
1 deletion
+15
-1
CHANGES.md
CHANGES.md
+1
-0
oap-server/server-configuration/configuration-k8s-configmap/src/main/java/org/apache/skywalking/oap/server/configuration/configmap/ConfigmapConfigurationWatcherRegister.java
...tion/configmap/ConfigmapConfigurationWatcherRegister.java
+1
-1
oap-server/server-configuration/configuration-k8s-configmap/src/test/java/org/apache/skywalking/oap/server/configuration/configmap/ConfigmapConfigWatcherRegisterTest.java
...uration/configmap/ConfigmapConfigWatcherRegisterTest.java
+13
-0
未找到文件。
CHANGES.md
浏览文件 @
5e40a099
...
@@ -41,6 +41,7 @@ Release Notes.
...
@@ -41,6 +41,7 @@ Release Notes.
*
Fix: Envoy error logs are not persisted when no metrics are generated
*
Fix: Envoy error logs are not persisted when no metrics are generated
*
Fix: Memory leakage of low version etcd client.
[
fix-issue
](
https://github.com/jurmous/etcd4j/pull/185
)
*
Fix: Memory leakage of low version etcd client.
[
fix-issue
](
https://github.com/jurmous/etcd4j/pull/185
)
*
Allow multiple definitions as fallback in metadata-service-mapping.yaml file.
*
Allow multiple definitions as fallback in metadata-service-mapping.yaml file.
*
Fix: NPE when configmap has no data.
#### UI
#### UI
*
Add logo for kong plugin.
*
Add logo for kong plugin.
...
...
oap-server/server-configuration/configuration-k8s-configmap/src/main/java/org/apache/skywalking/oap/server/configuration/configmap/ConfigmapConfigurationWatcherRegister.java
浏览文件 @
5e40a099
...
@@ -42,7 +42,7 @@ public class ConfigmapConfigurationWatcherRegister extends ConfigWatcherRegister
...
@@ -42,7 +42,7 @@ public class ConfigmapConfigurationWatcherRegister extends ConfigWatcherRegister
final
ConfigTable
configTable
=
new
ConfigTable
();
final
ConfigTable
configTable
=
new
ConfigTable
();
Optional
<
V1ConfigMap
>
v1ConfigMap
=
informer
.
configMap
();
Optional
<
V1ConfigMap
>
v1ConfigMap
=
informer
.
configMap
();
for
(
final
String
name
:
keys
)
{
for
(
final
String
name
:
keys
)
{
final
String
value
=
v1ConfigMap
.
map
(
configMap
->
configMap
.
getData
()
.
get
(
name
)).
orElse
(
null
);
final
String
value
=
v1ConfigMap
.
map
(
V1ConfigMap:
:
getData
).
map
(
data
->
data
.
get
(
name
)).
orElse
(
null
);
if
(
log
.
isDebugEnabled
())
{
if
(
log
.
isDebugEnabled
())
{
log
.
debug
(
"read config: name:{} ,value:{}"
,
name
,
value
);
log
.
debug
(
"read config: name:{} ,value:{}"
,
name
,
value
);
}
}
...
...
oap-server/server-configuration/configuration-k8s-configmap/src/test/java/org/apache/skywalking/oap/server/configuration/configmap/ConfigmapConfigWatcherRegisterTest.java
浏览文件 @
5e40a099
...
@@ -57,6 +57,19 @@ public class ConfigmapConfigWatcherRegisterTest {
...
@@ -57,6 +57,19 @@ public class ConfigmapConfigWatcherRegisterTest {
register
=
new
ConfigmapConfigurationWatcherRegister
(
settings
,
informer
);
register
=
new
ConfigmapConfigurationWatcherRegister
(
settings
,
informer
);
}
}
@Test
public
void
readConfigWhenConfigMapDataIsNull
()
throws
Exception
{
V1ConfigMap
v1ConfigMap
=
new
V1ConfigMap
();
PowerMockito
.
doReturn
(
Optional
.
of
(
v1ConfigMap
)).
when
(
informer
).
configMap
();
Optional
<
ConfigTable
>
optionalConfigTable
=
register
.
readConfig
(
new
HashSet
<
String
>()
{{
add
(
"key1"
);
}});
Assert
.
assertTrue
(
optionalConfigTable
.
isPresent
());
ConfigTable
configTable
=
optionalConfigTable
.
get
();
Assert
.
assertEquals
(
configTable
.
getItems
().
size
(),
0
);
}
@Test
@Test
public
void
readConfigWhenInformerNotwork
()
throws
Exception
{
public
void
readConfigWhenInformerNotwork
()
throws
Exception
{
PowerMockito
.
doReturn
(
Optional
.
empty
()).
when
(
informer
).
configMap
();
PowerMockito
.
doReturn
(
Optional
.
empty
()).
when
(
informer
).
configMap
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录