Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug 4037: Allow auto-downed node to rejoin cluster
[controller.git]
/
opendaylight
/
md-sal
/
sal-clustering-commons
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
common
/
actor
/
MeteredBoundedMailbox.java
diff --git
a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailbox.java
b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailbox.java
index f1a78194a95c9430c35eaf5e3cf398a8287a370f..2a6aac4d79d95ec603591fa84865d0517c35d84d 100644
(file)
--- a/
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailbox.java
+++ b/
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailbox.java
@@
-26,9
+26,9
@@
public class MeteredBoundedMailbox implements MailboxType, ProducesMessageQueue<
private final Logger LOG = LoggerFactory.getLogger(MeteredBoundedMailbox.class);
private MeteredMessageQueue queue;
private final Logger LOG = LoggerFactory.getLogger(MeteredBoundedMailbox.class);
private MeteredMessageQueue queue;
- private Integer capacity;
- private FiniteDuration pushTimeOut;
- private MetricRegistry registry;
+ private
final
Integer capacity;
+ private
final
FiniteDuration pushTimeOut;
+ private
final
MetricRegistry registry;
private final String QUEUE_SIZE = "q-size";
private final String QUEUE_SIZE = "q-size";
@@
-38,7
+38,7
@@
public class MeteredBoundedMailbox implements MailboxType, ProducesMessageQueue<
this.capacity = commonConfig.getMailBoxCapacity();
this.pushTimeOut = commonConfig.getMailBoxPushTimeout();
this.capacity = commonConfig.getMailBoxCapacity();
this.pushTimeOut = commonConfig.getMailBoxPushTimeout();
- MetricsReporter reporter = MetricsReporter.getInstance();
+ MetricsReporter reporter = MetricsReporter.getInstance(
MeteringBehavior.DOMAIN
);
registry = reporter.getMetricsRegistry();
}
registry = reporter.getMetricsRegistry();
}
@@
-58,9
+58,11
@@
public class MeteredBoundedMailbox implements MailboxType, ProducesMessageQueue<
String metricName = MetricRegistry.name(actorName, QUEUE_SIZE);
if (registry.getMetrics().containsKey(metricName))
String metricName = MetricRegistry.name(actorName, QUEUE_SIZE);
if (registry.getMetrics().containsKey(metricName))
+ {
return; //already registered
return; //already registered
+ }
- Gauge queueSize = getQueueSizeGuage(monitoredQueue);
+ Gauge
<Integer>
queueSize = getQueueSizeGuage(monitoredQueue);
registerQueueSizeMetric(metricName, queueSize);
}
registerQueueSizeMetric(metricName, queueSize);
}
@@
-73,7
+75,7
@@
public class MeteredBoundedMailbox implements MailboxType, ProducesMessageQueue<
}
}
}
}
- private Gauge getQueueSizeGuage(final MeteredMessageQueue monitoredQueue ){
+ private Gauge
<Integer>
getQueueSizeGuage(final MeteredMessageQueue monitoredQueue ){
return new Gauge<Integer>() {
@Override
public Integer getValue() {
return new Gauge<Integer>() {
@Override
public Integer getValue() {
@@
-82,7
+84,7
@@
public class MeteredBoundedMailbox implements MailboxType, ProducesMessageQueue<
};
}
};
}
- private void registerQueueSizeMetric(String metricName, Gauge metric){
+ private void registerQueueSizeMetric(String metricName, Gauge
<Integer>
metric){
try {
registry.register(metricName,metric);
} catch (IllegalArgumentException e) {
try {
registry.register(metricName,metric);
} catch (IllegalArgumentException e) {