From 4572eed73d9512bd3bfc26e1e80e3bcb8836582a Mon Sep 17 00:00:00 2001 From: pxsalehi Date: Thu, 3 Aug 2017 14:03:24 +0200 Subject: [PATCH 1/2] GOSSIP-87 Unused workQueue in gossipCore --- .../org/apache/gossip/manager/GossipCore.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/gossip-base/src/main/java/org/apache/gossip/manager/GossipCore.java b/gossip-base/src/main/java/org/apache/gossip/manager/GossipCore.java index 4167664..e44302e 100644 --- a/gossip-base/src/main/java/org/apache/gossip/manager/GossipCore.java +++ b/gossip-base/src/main/java/org/apache/gossip/manager/GossipCore.java @@ -57,26 +57,24 @@ public class GossipCore implements GossipCoreConstants { private ConcurrentHashMap requests; private final ConcurrentHashMap> perNodeData; private final ConcurrentHashMap sharedData; - private final BlockingQueue workQueue; private final Meter messageSerdeException; - private final Meter tranmissionException; - private final Meter tranmissionSuccess; + private final Meter transmissionException; + private final Meter transmissionSuccess; private final DataEventManager eventManager; public GossipCore(GossipManager manager, MetricRegistry metrics){ this.gossipManager = manager; requests = new ConcurrentHashMap<>(); - workQueue = new ArrayBlockingQueue<>(1024); perNodeData = new ConcurrentHashMap<>(); sharedData = new ConcurrentHashMap<>(); eventManager = new DataEventManager(metrics); - metrics.register(WORKQUEUE_SIZE, (Gauge)() -> workQueue.size()); + metrics.register(WORKQUEUE_SIZE, (Gauge)() -> 0); metrics.register(PER_NODE_DATA_SIZE, (Gauge)() -> perNodeData.size()); metrics.register(SHARED_DATA_SIZE, (Gauge)() -> sharedData.size()); metrics.register(REQUEST_SIZE, (Gauge)() -> requests.size()); messageSerdeException = metrics.meter(MESSAGE_SERDE_EXCEPTION); - tranmissionException = metrics.meter(MESSAGE_TRANSMISSION_EXCEPTION); - tranmissionSuccess = metrics.meter(MESSAGE_TRANSMISSION_SUCCESS); + transmissionException = metrics.meter(MESSAGE_TRANSMISSION_EXCEPTION); + transmissionSuccess = metrics.meter(MESSAGE_TRANSMISSION_SUCCESS); } @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -172,9 +170,9 @@ public class GossipCore implements GossipCoreConstants { } try { gossipManager.getTransportManager().send(uri, json_bytes); - tranmissionSuccess.mark(); + transmissionSuccess.mark(); } catch (IOException e) { - tranmissionException.mark(); + transmissionException.mark(); throw new RuntimeException(e); } } From 5280dc8a18b951c5061471731a9d54b2eafdfb2d Mon Sep 17 00:00:00 2001 From: pxsalehi Date: Tue, 8 Aug 2017 19:23:22 +0200 Subject: [PATCH 2/2] GOSSIP-87 removed WORKQUEUE_SIZE metric --- .../src/main/java/org/apache/gossip/manager/GossipCore.java | 1 - .../main/java/org/apache/gossip/manager/GossipCoreConstants.java | 1 - 2 files changed, 2 deletions(-) diff --git a/gossip-base/src/main/java/org/apache/gossip/manager/GossipCore.java b/gossip-base/src/main/java/org/apache/gossip/manager/GossipCore.java index e44302e..384d796 100644 --- a/gossip-base/src/main/java/org/apache/gossip/manager/GossipCore.java +++ b/gossip-base/src/main/java/org/apache/gossip/manager/GossipCore.java @@ -68,7 +68,6 @@ public class GossipCore implements GossipCoreConstants { perNodeData = new ConcurrentHashMap<>(); sharedData = new ConcurrentHashMap<>(); eventManager = new DataEventManager(metrics); - metrics.register(WORKQUEUE_SIZE, (Gauge)() -> 0); metrics.register(PER_NODE_DATA_SIZE, (Gauge)() -> perNodeData.size()); metrics.register(SHARED_DATA_SIZE, (Gauge)() -> sharedData.size()); metrics.register(REQUEST_SIZE, (Gauge)() -> requests.size()); diff --git a/gossip-base/src/main/java/org/apache/gossip/manager/GossipCoreConstants.java b/gossip-base/src/main/java/org/apache/gossip/manager/GossipCoreConstants.java index 6d3765a..9cac7c0 100644 --- a/gossip-base/src/main/java/org/apache/gossip/manager/GossipCoreConstants.java +++ b/gossip-base/src/main/java/org/apache/gossip/manager/GossipCoreConstants.java @@ -18,7 +18,6 @@ package org.apache.gossip.manager; public interface GossipCoreConstants { - String WORKQUEUE_SIZE = "gossip.core.workqueue.size"; String PER_NODE_DATA_SIZE = "gossip.core.pernodedata.size"; String SHARED_DATA_SIZE = "gossip.core.shareddata.size"; String REQUEST_SIZE = "gossip.core.requests.size";