Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Forever310
druid
提交
1addea4d
D
druid
项目概览
Forever310
/
druid
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
druid
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1addea4d
编写于
5月 19, 2014
作者:
F
fjy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
more code review comments
上级
6126dd42
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
13 addition
and
43 deletion
+13
-43
server/src/main/java/io/druid/client/ImmutableDruidServer.java
...r/src/main/java/io/druid/client/ImmutableDruidServer.java
+0
-25
server/src/main/java/io/druid/db/DatabaseRuleManager.java
server/src/main/java/io/druid/db/DatabaseRuleManager.java
+5
-12
server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java
...in/java/io/druid/server/coordinator/DruidCoordinator.java
+4
-0
server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorRuleRunner.java
...server/coordinator/helper/DruidCoordinatorRuleRunner.java
+4
-6
未找到文件。
server/src/main/java/io/druid/client/ImmutableDruidServer.java
浏览文件 @
1addea4d
...
...
@@ -101,29 +101,4 @@ public class ImmutableDruidServer
{
return
segments
;
}
@Override
public
boolean
equals
(
Object
o
)
{
if
(
this
==
o
)
{
return
true
;
}
if
(
o
==
null
||
getClass
()
!=
o
.
getClass
())
{
return
false
;
}
ImmutableDruidServer
that
=
(
ImmutableDruidServer
)
o
;
if
(
metadata
!=
null
?
!
metadata
.
equals
(
that
.
metadata
)
:
that
.
metadata
!=
null
)
{
return
false
;
}
return
true
;
}
@Override
public
int
hashCode
()
{
return
metadata
!=
null
?
metadata
.
hashCode
()
:
0
;
}
}
server/src/main/java/io/druid/db/DatabaseRuleManager.java
浏览文件 @
1addea4d
...
...
@@ -51,7 +51,6 @@ import java.sql.SQLException;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.concurrent.ConcurrentHashMap
;
import
java.util.concurrent.ScheduledExecutorService
;
import
java.util.concurrent.atomic.AtomicReference
;
...
...
@@ -125,7 +124,7 @@ public class DatabaseRuleManager
private
final
Supplier
<
DatabaseRuleManagerConfig
>
config
;
private
final
Supplier
<
DbTablesConfig
>
dbTables
;
private
final
IDBI
dbi
;
private
final
AtomicReference
<
ConcurrentHash
Map
<
String
,
List
<
Rule
>>>
rules
;
private
final
AtomicReference
<
Immutable
Map
<
String
,
List
<
Rule
>>>
rules
;
private
volatile
ScheduledExecutorService
exec
;
...
...
@@ -146,8 +145,8 @@ public class DatabaseRuleManager
this
.
dbTables
=
dbTables
;
this
.
dbi
=
dbi
;
this
.
rules
=
new
AtomicReference
<
ConcurrentHashMap
<
String
,
List
<
Rule
>>
>(
new
ConcurrentHashMap
<
String
,
List
<
Rule
>>
()
this
.
rules
=
new
AtomicReference
<>(
ImmutableMap
.<
String
,
List
<
Rule
>>
of
()
);
}
...
...
@@ -188,7 +187,7 @@ public class DatabaseRuleManager
return
;
}
rules
.
set
(
new
ConcurrentHashMap
<
String
,
List
<
Rule
>>
());
rules
.
set
(
ImmutableMap
.<
String
,
List
<
Rule
>>
of
());
started
=
false
;
exec
.
shutdownNow
();
...
...
@@ -199,7 +198,7 @@ public class DatabaseRuleManager
public
void
poll
()
{
try
{
ConcurrentHashMap
<
String
,
List
<
Rule
>>
newRules
=
new
ConcurrentHashMap
<
String
,
List
<
Rule
>>
(
ImmutableMap
<
String
,
List
<
Rule
>>
newRules
=
ImmutableMap
.
copyOf
(
dbi
.
withHandle
(
new
HandleCallback
<
Map
<
String
,
List
<
Rule
>>>()
{
...
...
@@ -309,12 +308,6 @@ public class DatabaseRuleManager
}
}
);
ConcurrentHashMap
<
String
,
List
<
Rule
>>
existingRules
=
rules
.
get
();
if
(
existingRules
==
null
)
{
existingRules
=
new
ConcurrentHashMap
<
String
,
List
<
Rule
>>();
}
existingRules
.
put
(
dataSource
,
newRules
);
}
catch
(
Exception
e
)
{
log
.
error
(
e
,
String
.
format
(
"Exception while overriding rule for %s"
,
dataSource
));
...
...
server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java
浏览文件 @
1addea4d
...
...
@@ -350,6 +350,10 @@ public class DruidCoordinator
)
{
try
{
if
(
fromServer
.
getMetadata
().
equals
(
toServer
.
getMetadata
()))
{
throw
new
IAE
(
"Cannot move [%s] to and from the same server [%s]"
,
segmentName
,
fromServer
.
getName
());
}
final
DataSegment
segment
=
fromServer
.
getSegment
(
segmentName
);
if
(
segment
==
null
)
{
throw
new
IAE
(
"Unable to find segment [%s] on server [%s]"
,
segmentName
,
fromServer
.
getName
());
...
...
server/src/main/java/io/druid/server/coordinator/helper/DruidCoordinatorRuleRunner.java
浏览文件 @
1addea4d
...
...
@@ -76,8 +76,8 @@ public class DruidCoordinatorRuleRunner implements DruidCoordinatorHelper
}
DruidCoordinatorRuntimeParams
paramsWithReplicationManager
=
params
.
buildFromExisting
()
.
withReplicationManager
(
replicatorThrottler
)
.
build
();
.
withReplicationManager
(
replicatorThrottler
)
.
build
();
// Run through all matched rules for available segments
DateTime
now
=
new
DateTime
();
...
...
@@ -94,10 +94,8 @@ public class DruidCoordinatorRuleRunner implements DruidCoordinatorHelper
}
if
(!
foundMatchingRule
)
{
log
.
makeAlert
(
"Unable to find a matching rule for dataSource[%s]"
,
segment
.
getDataSource
()
)
log
.
makeAlert
(
"Unable to find a matching rule!"
)
.
addData
(
"dataSource"
,
segment
.
getDataSource
())
.
addData
(
"segment"
,
segment
.
getIdentifier
())
.
emit
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录