incubator-omid git commit: [OMID-89] Fix metrics in Persistence processsor handlers

2018-06-10 Thread ohads 
Repository: incubator-omid
Updated Branches:
  refs/heads/master e3d7fe36b -> 382dc6777


[OMID-89] Fix metrics in Persistence processsor handlers

Change-Id: Ieb6cdf5d47cb113ea6cc8e9799bfbdef20b66565


Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/382dc677
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/382dc677
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/382dc677

Branch: refs/heads/master
Commit: 382dc6777360e1e74b31255f102c561b90114c86
Parents: e3d7fe3
Author: Francisco Perez-Sorrosal 
Authored: Fri Feb 2 15:09:02 2018 -0800
Committer: Ohad Shacham 
Committed: Sun Jun 10 12:05:42 2018 +0300

--
 .../omid/tso/PersistenceProcessorHandler.java   | 34 +---
 .../tso/TestPersistenceProcessorHandler.java| 30 +
 2 files changed, 59 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/382dc677/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorHandler.java
--
diff --git 
a/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorHandler.java 
b/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorHandler.java
index 07241f0..8a93fc4 100644
--- 
a/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorHandler.java
+++ 
b/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorHandler.java
@@ -17,6 +17,8 @@
  */
 package org.apache.omid.tso;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Objects;
 import com.lmax.disruptor.WorkHandler;
 import org.apache.omid.committable.CommitTable;
 import org.apache.omid.metrics.Histogram;
@@ -28,6 +30,7 @@ import org.slf4j.LoggerFactory;
 import javax.inject.Inject;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import static com.codahale.metrics.MetricRegistry.name;
 import static org.apache.omid.tso.PersistEvent.Type.*;
@@ -36,6 +39,11 @@ public class PersistenceProcessorHandler implements 
WorkHandlerhttp://git-wip-us.apache.org/repos/asf/incubator-omid/blob/382dc677/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java
--
diff --git 
a/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java
 
b/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java
index d60d019..43f354f 100644
--- 
a/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java
+++ 
b/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java
@@ -126,6 +126,36 @@ public class TestPersistenceProcessorHandler {
 Mockito.reset(mockWriter);
 }
 
+@Test(timeOut = 1_000)
+public void testPersistentProcessorHandlerIdsAreCreatedConsecutive() 
throws Exception {
+
+TSOServerConfig tsoConfig = new TSOServerConfig();
+tsoConfig.setNumConcurrentCTWriters(32);
+
+PersistenceProcessorHandler[] handlers = new 
PersistenceProcessorHandler[tsoConfig.getNumConcurrentCTWriters()];
+for (int i = 0; i < tsoConfig.getNumConcurrentCTWriters(); i++) {
+handlers[i] = new PersistenceProcessorHandler(metrics,
+  "localhost:1234",
+  
mock(LeaseManager.class),
+  commitTable,
+  
mock(ReplyProcessor.class),
+  retryProcessor,
+  panicker);
+}
+
+for (int i = 0; i < tsoConfig.getNumConcurrentCTWriters(); i++) {
+// Required to generalize the cases when other tests have 
increased the static variable assigning the ids
+if (i + 1 < tsoConfig.getNumConcurrentCTWriters()) {
+int followingHandlerIdAsInt = Integer.valueOf(handlers[i + 
1].getId());
+assertEquals(handlers[i].getId(), 
String.valueOf(followingHandlerIdAsInt - 1));
+} else { // Final case: compare with the last element that the 
sequence creator assigned
+int followingHandlerIdAsInt = 
PersistenceProcessorHandler.consecutiveSequenceCreator.get();
+assertEquals(handlers[i].getId(), 
String.valueOf(followingHandlerIdAsInt - 1));
+}
+}
+
+}
+
 @Test(timeOut = 10_000)
 public void testProcessingOfEmptyBatchPersistEvent() throws Exception {

[8/8] incubator-omid git commit: [OMID-89] Fix metrics in Persistence processsor handlers

2018-03-04 Thread ohads 
[OMID-89] Fix metrics in Persistence processsor handlers

Change-Id: Ieb6cdf5d47cb113ea6cc8e9799bfbdef20b66565


Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/558c640b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/558c640b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/558c640b

Branch: refs/heads/0.9.0
Commit: 558c640b849e5abc5311b4d35796756b4b05e7a6
Parents: 57968cc
Author: Francisco Perez-Sorrosal 
Authored: Fri Feb 2 15:09:02 2018 -0800
Committer: Francisco Perez-Sorrosal 
Committed: Wed Feb 14 10:42:35 2018 -0800

--
 .../omid/tso/PersistenceProcessorHandler.java   | 34 +---
 .../tso/TestPersistenceProcessorHandler.java| 30 +
 2 files changed, 59 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/558c640b/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorHandler.java
--
diff --git 
a/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorHandler.java 
b/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorHandler.java
index 07241f0..8a93fc4 100644
--- 
a/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorHandler.java
+++ 
b/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorHandler.java
@@ -17,6 +17,8 @@
  */
 package org.apache.omid.tso;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Objects;
 import com.lmax.disruptor.WorkHandler;
 import org.apache.omid.committable.CommitTable;
 import org.apache.omid.metrics.Histogram;
@@ -28,6 +30,7 @@ import org.slf4j.LoggerFactory;
 import javax.inject.Inject;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import static com.codahale.metrics.MetricRegistry.name;
 import static org.apache.omid.tso.PersistEvent.Type.*;
@@ -36,6 +39,11 @@ public class PersistenceProcessorHandler implements 
WorkHandlerhttp://git-wip-us.apache.org/repos/asf/incubator-omid/blob/558c640b/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java
--
diff --git 
a/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java
 
b/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java
index d60d019..43f354f 100644
--- 
a/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java
+++ 
b/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java
@@ -126,6 +126,36 @@ public class TestPersistenceProcessorHandler {
 Mockito.reset(mockWriter);
 }
 
+@Test(timeOut = 1_000)
+public void testPersistentProcessorHandlerIdsAreCreatedConsecutive() 
throws Exception {
+
+TSOServerConfig tsoConfig = new TSOServerConfig();
+tsoConfig.setNumConcurrentCTWriters(32);
+
+PersistenceProcessorHandler[] handlers = new 
PersistenceProcessorHandler[tsoConfig.getNumConcurrentCTWriters()];
+for (int i = 0; i < tsoConfig.getNumConcurrentCTWriters(); i++) {
+handlers[i] = new PersistenceProcessorHandler(metrics,
+  "localhost:1234",
+  
mock(LeaseManager.class),
+  commitTable,
+  
mock(ReplyProcessor.class),
+  retryProcessor,
+  panicker);
+}
+
+for (int i = 0; i < tsoConfig.getNumConcurrentCTWriters(); i++) {
+// Required to generalize the cases when other tests have 
increased the static variable assigning the ids
+if (i + 1 < tsoConfig.getNumConcurrentCTWriters()) {
+int followingHandlerIdAsInt = Integer.valueOf(handlers[i + 
1].getId());
+assertEquals(handlers[i].getId(), 
String.valueOf(followingHandlerIdAsInt - 1));
+} else { // Final case: compare with the last element that the 
sequence creator assigned
+int followingHandlerIdAsInt = 
PersistenceProcessorHandler.consecutiveSequenceCreator.get();
+assertEquals(handlers[i].getId(), 
String.valueOf(followingHandlerIdAsInt - 1));
+}
+}
+
+}
+
 @Test(timeOut = 10_000)
 public void testProcessingOfEmptyBatchPersistEvent() throws Exception {

incubator-omid git commit: [OMID-89] Fix metrics in Persistence processsor handlers

2018-02-14 Thread fperezsorrosal 
Repository: incubator-omid
Updated Branches:
  refs/heads/0.9.0.0 57968cc1d -> 558c640b8


[OMID-89] Fix metrics in Persistence processsor handlers

Change-Id: Ieb6cdf5d47cb113ea6cc8e9799bfbdef20b66565


Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/558c640b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/558c640b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/558c640b

Branch: refs/heads/0.9.0.0
Commit: 558c640b849e5abc5311b4d35796756b4b05e7a6
Parents: 57968cc
Author: Francisco Perez-Sorrosal 
Authored: Fri Feb 2 15:09:02 2018 -0800
Committer: Francisco Perez-Sorrosal 
Committed: Wed Feb 14 10:42:35 2018 -0800

--
 .../omid/tso/PersistenceProcessorHandler.java   | 34 +---
 .../tso/TestPersistenceProcessorHandler.java| 30 +
 2 files changed, 59 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/558c640b/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorHandler.java
--
diff --git 
a/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorHandler.java 
b/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorHandler.java
index 07241f0..8a93fc4 100644
--- 
a/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorHandler.java
+++ 
b/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorHandler.java
@@ -17,6 +17,8 @@
  */
 package org.apache.omid.tso;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Objects;
 import com.lmax.disruptor.WorkHandler;
 import org.apache.omid.committable.CommitTable;
 import org.apache.omid.metrics.Histogram;
@@ -28,6 +30,7 @@ import org.slf4j.LoggerFactory;
 import javax.inject.Inject;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import static com.codahale.metrics.MetricRegistry.name;
 import static org.apache.omid.tso.PersistEvent.Type.*;
@@ -36,6 +39,11 @@ public class PersistenceProcessorHandler implements 
WorkHandlerhttp://git-wip-us.apache.org/repos/asf/incubator-omid/blob/558c640b/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java
--
diff --git 
a/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java
 
b/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java
index d60d019..43f354f 100644
--- 
a/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java
+++ 
b/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java
@@ -126,6 +126,36 @@ public class TestPersistenceProcessorHandler {
 Mockito.reset(mockWriter);
 }
 
+@Test(timeOut = 1_000)
+public void testPersistentProcessorHandlerIdsAreCreatedConsecutive() 
throws Exception {
+
+TSOServerConfig tsoConfig = new TSOServerConfig();
+tsoConfig.setNumConcurrentCTWriters(32);
+
+PersistenceProcessorHandler[] handlers = new 
PersistenceProcessorHandler[tsoConfig.getNumConcurrentCTWriters()];
+for (int i = 0; i < tsoConfig.getNumConcurrentCTWriters(); i++) {
+handlers[i] = new PersistenceProcessorHandler(metrics,
+  "localhost:1234",
+  
mock(LeaseManager.class),
+  commitTable,
+  
mock(ReplyProcessor.class),
+  retryProcessor,
+  panicker);
+}
+
+for (int i = 0; i < tsoConfig.getNumConcurrentCTWriters(); i++) {
+// Required to generalize the cases when other tests have 
increased the static variable assigning the ids
+if (i + 1 < tsoConfig.getNumConcurrentCTWriters()) {
+int followingHandlerIdAsInt = Integer.valueOf(handlers[i + 
1].getId());
+assertEquals(handlers[i].getId(), 
String.valueOf(followingHandlerIdAsInt - 1));
+} else { // Final case: compare with the last element that the 
sequence creator assigned
+int followingHandlerIdAsInt = 
PersistenceProcessorHandler.consecutiveSequenceCreator.get();
+assertEquals(handlers[i].getId(), 
String.valueOf(followingHandlerIdAsInt - 1));
+}
+}
+
+}
+
 @Test(timeOut = 10_000)
 public void testProcessingOfEmptyBatchPersistEvent() throws Exception {