Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
pulsar
提交
8bc42352
pulsar
项目概览
apache
/
pulsar
通知
129
Star
40
Fork
3
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Wiki
1
Wiki
分析
仓库
DevOps
项目成员
Pages
pulsar
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Pages
分析
分析
仓库分析
DevOps
Wiki
1
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
提交
体验新版 GitCode,发现更多精彩内容 >>
提交
8bc42352
编写于
4月 12, 2017
作者:
A
Andrews
提交者:
Matteo Merli
4月 12, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes to some of the issues reported by fbinfer static code analyzer (#344)
上级
f5722415
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
22 addition
and
9 deletion
+22
-9
managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorContainer.java
...pache/bookkeeper/mledger/impl/ManagedCursorContainer.java
+1
-1
pulsar-broker/src/main/java/com/yahoo/pulsar/broker/loadbalance/impl/SimpleLoadManagerImpl.java
...pulsar/broker/loadbalance/impl/SimpleLoadManagerImpl.java
+5
-0
pulsar-broker/src/main/java/com/yahoo/pulsar/broker/loadbalance/impl/SimpleResourceAllocationPolicies.java
...er/loadbalance/impl/SimpleResourceAllocationPolicies.java
+6
-3
pulsar-broker/src/main/java/com/yahoo/pulsar/broker/namespace/NamespaceService.java
...a/com/yahoo/pulsar/broker/namespace/NamespaceService.java
+0
-3
pulsar-client-admin/src/main/java/com/yahoo/pulsar/client/admin/PulsarAdmin.java
.../main/java/com/yahoo/pulsar/client/admin/PulsarAdmin.java
+2
-1
pulsar-client-tools/src/main/java/com/yahoo/pulsar/client/cli/CmdProduce.java
...src/main/java/com/yahoo/pulsar/client/cli/CmdProduce.java
+1
-0
pulsar-client/src/main/java/com/yahoo/pulsar/client/impl/ConsumerStats.java
...main/java/com/yahoo/pulsar/client/impl/ConsumerStats.java
+3
-0
pulsar-client/src/main/java/com/yahoo/pulsar/client/impl/ProducerStats.java
...main/java/com/yahoo/pulsar/client/impl/ProducerStats.java
+3
-0
pulsar-common/src/main/java/com/yahoo/pulsar/common/policies/impl/NamespaceIsolationPolicies.java
...lsar/common/policies/impl/NamespaceIsolationPolicies.java
+1
-1
未找到文件。
managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorContainer.java
浏览文件 @
8bc42352
...
...
@@ -246,7 +246,7 @@ class ManagedCursorContainer implements Iterable<ManagedCursor> {
Item
right
=
getRight
(
item
);
if
(
right
!=
null
&&
right
.
position
.
compareTo
(
item
.
position
)
<
0
)
{
Item
left
=
getLeft
(
item
);
if
(
left
.
position
.
compareTo
(
right
.
position
)
<
0
)
{
if
(
left
!=
null
&&
left
.
position
.
compareTo
(
right
.
position
)
<
0
)
{
j
=
left
;
}
else
{
j
=
right
;
...
...
pulsar-broker/src/main/java/com/yahoo/pulsar/broker/loadbalance/impl/SimpleLoadManagerImpl.java
浏览文件 @
8bc42352
...
...
@@ -1319,6 +1319,11 @@ public class SimpleLoadManagerImpl implements LoadManager, ZooKeeperCacheListene
if
(
isAboveLoadLevel
(
lr
.
getSystemResourceUsage
(),
overloadThreshold
))
{
ResourceType
bottleneckResourceType
=
lr
.
getBottleneckResourceType
();
Map
<
String
,
NamespaceBundleStats
>
bundleStats
=
lr
.
getSortedBundleStats
(
bottleneckResourceType
);
if
(
bundleStats
==
null
)
{
log
.
warn
(
"Null bundle stats for bundle {}"
,
lr
.
getName
());
continue
;
}
// 1. owns only one namespace
if
(
bundleStats
.
size
()
==
1
)
{
// can't unload one namespace, just issue a warning message
...
...
pulsar-broker/src/main/java/com/yahoo/pulsar/broker/loadbalance/impl/SimpleResourceAllocationPolicies.java
浏览文件 @
8bc42352
...
...
@@ -81,11 +81,13 @@ public class SimpleResourceAllocationPolicies {
}
public
boolean
isPrimaryBroker
(
NamespaceName
namespace
,
String
broker
)
{
return
getNamespaceIsolationPolicy
(
namespace
).
isPrimaryBroker
(
broker
);
NamespaceIsolationPolicy
nsPolicy
=
getNamespaceIsolationPolicy
(
namespace
);
return
(
nsPolicy
!=
null
)
?
nsPolicy
.
isPrimaryBroker
(
broker
)
:
false
;
}
public
boolean
isSecondaryBroker
(
NamespaceName
namespace
,
String
broker
)
{
return
getNamespaceIsolationPolicy
(
namespace
).
isSecondaryBroker
(
broker
);
NamespaceIsolationPolicy
nsPolicy
=
getNamespaceIsolationPolicy
(
namespace
);
return
(
nsPolicy
!=
null
)
?
nsPolicy
.
isSecondaryBroker
(
broker
)
:
false
;
}
public
boolean
isSharedBroker
(
String
broker
)
{
...
...
@@ -101,6 +103,7 @@ public class SimpleResourceAllocationPolicies {
}
public
boolean
shouldFailoverToSecondaries
(
NamespaceName
namespace
,
int
totalPrimaryCandidates
)
{
return
getNamespaceIsolationPolicy
(
namespace
).
shouldFailover
(
totalPrimaryCandidates
);
NamespaceIsolationPolicy
nsPolicy
=
getNamespaceIsolationPolicy
(
namespace
);
return
(
nsPolicy
!=
null
)
?
nsPolicy
.
shouldFailover
(
totalPrimaryCandidates
)
:
false
;
}
}
pulsar-broker/src/main/java/com/yahoo/pulsar/broker/namespace/NamespaceService.java
浏览文件 @
8bc42352
...
...
@@ -46,7 +46,6 @@ import org.slf4j.LoggerFactory;
import
com.google.common.collect.Lists
;
import
com.google.common.hash.Hashing
;
import
com.yahoo.pulsar.broker.LocalBrokerData
;
import
com.yahoo.pulsar.broker.PulsarServerException
;
import
com.yahoo.pulsar.broker.PulsarService
;
import
com.yahoo.pulsar.broker.ServiceConfiguration
;
...
...
@@ -67,12 +66,10 @@ import com.yahoo.pulsar.common.policies.data.BrokerAssignment;
import
com.yahoo.pulsar.common.policies.data.BundlesData
;
import
com.yahoo.pulsar.common.policies.data.LocalPolicies
;
import
com.yahoo.pulsar.common.policies.data.NamespaceOwnershipStatus
;
import
com.yahoo.pulsar.common.policies.data.loadbalancer.LoadReport
;
import
com.yahoo.pulsar.common.policies.data.loadbalancer.ServiceLookupData
;
import
com.yahoo.pulsar.common.policies.impl.NamespaceIsolationPolicies
;
import
com.yahoo.pulsar.common.util.Codec
;
import
com.yahoo.pulsar.common.util.ObjectMapperFactory
;
import
com.yahoo.pulsar.zookeeper.ZooKeeperCache.Deserializer
;
/**
* The <code>NamespaceService</code> provides resource ownership lookup as well as resource ownership claiming services
...
...
pulsar-client-admin/src/main/java/com/yahoo/pulsar/client/admin/PulsarAdmin.java
浏览文件 @
8bc42352
...
...
@@ -47,6 +47,7 @@ import com.yahoo.pulsar.client.api.AuthenticationDataProvider;
import
com.yahoo.pulsar.client.api.AuthenticationFactory
;
import
com.yahoo.pulsar.client.api.ClientConfiguration
;
import
com.yahoo.pulsar.client.api.PulsarClientException
;
import
com.yahoo.pulsar.client.impl.auth.AuthenticationDisabled
;
import
com.yahoo.pulsar.common.util.SecurityUtility
;
/**
...
...
@@ -98,7 +99,7 @@ public class PulsarAdmin implements Closeable {
* the ClientConfiguration object to be used to talk with Pulsar
*/
public
PulsarAdmin
(
URL
serviceUrl
,
ClientConfiguration
pulsarConfig
)
throws
PulsarClientException
{
this
.
auth
=
pulsarConfig
!=
null
?
pulsarConfig
.
getAuthentication
()
:
n
ull
;
this
.
auth
=
pulsarConfig
!=
null
?
pulsarConfig
.
getAuthentication
()
:
n
ew
AuthenticationDisabled
()
;
LOG
.
debug
(
"created: serviceUrl={}, authMethodName={}"
,
serviceUrl
,
auth
!=
null
?
auth
.
getAuthMethodName
()
:
null
);
...
...
pulsar-client-tools/src/main/java/com/yahoo/pulsar/client/cli/CmdProduce.java
浏览文件 @
8bc42352
...
...
@@ -103,6 +103,7 @@ public class CmdProduce {
byte
[]
fileBytes
=
new
byte
[(
int
)
f
.
length
()];
fis
.
read
(
fileBytes
);
messageBodies
.
add
(
fileBytes
);
fis
.
close
();
}
}
catch
(
Exception
e
)
{
...
...
pulsar-client/src/main/java/com/yahoo/pulsar/client/impl/ConsumerStats.java
浏览文件 @
8bc42352
...
...
@@ -183,6 +183,9 @@ public class ConsumerStats implements Serializable {
}
void
updateCumulativeStats
(
ConsumerStats
stats
)
{
if
(
stats
==
null
)
{
return
;
}
numMsgsReceived
.
add
(
stats
.
numMsgsReceived
.
longValue
());
numBytesReceived
.
add
(
stats
.
numBytesReceived
.
longValue
());
numReceiveFailed
.
add
(
stats
.
numReceiveFailed
.
longValue
());
...
...
pulsar-client/src/main/java/com/yahoo/pulsar/client/impl/ProducerStats.java
浏览文件 @
8bc42352
...
...
@@ -199,6 +199,9 @@ public class ProducerStats implements Serializable {
}
void
updateCumulativeStats
(
ProducerStats
stats
)
{
if
(
stats
==
null
)
{
return
;
}
numMsgsSent
.
add
(
stats
.
numMsgsSent
.
longValue
());
numBytesSent
.
add
(
stats
.
numBytesSent
.
longValue
());
numSendFailed
.
add
(
stats
.
numSendFailed
.
longValue
());
...
...
pulsar-common/src/main/java/com/yahoo/pulsar/common/policies/impl/NamespaceIsolationPolicies.java
浏览文件 @
8bc42352
...
...
@@ -158,7 +158,7 @@ public class NamespaceIsolationPolicies {
BrokerAssignment
brokerAssignment
=
this
.
getBrokerAssignment
(
nsPolicy
,
brkStatus
.
getBrokerAddress
());
if
(
brokerAssignment
==
BrokerAssignment
.
primary
)
{
// Only add to candidates if allowed by policy
if
(
nsPolicy
.
isPrimaryBrokerAvailable
(
brkStatus
))
{
if
(
nsPolicy
!=
null
&&
nsPolicy
.
isPrimaryBrokerAvailable
(
brkStatus
))
{
primaryCandidates
.
add
(
brkStatus
);
}
}
else
if
(
brokerAssignment
==
BrokerAssignment
.
secondary
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录