You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org> on 2016/05/16 21:23:07 UTC

Change in asterixdb[master]: SONAR: Synchronization On Boxed Primitives

Michael Blow has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/853

Change subject: SONAR: Synchronization On Boxed Primitives
......................................................................

SONAR: Synchronization On Boxed Primitives

Synchronization should not be based on Strings or boxed primitives

Fixes:
 - https://asterix-sonar.ics.uci.edu/issues/search#issues=AVR98lUKuXNBBqjTzg_N
 - https://asterix-sonar.ics.uci.edu/issues/search#issues=AVR98lUKuXNBBqjTzg_O
 - https://asterix-sonar.ics.uci.edu/issues/search#issues=AVR98lUKuXNBBqjTzg_P

Change-Id: I520582cb5a03d775d696ec5b4390b571322e18f7
---
M asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/ClusterStateWatcher.java
1 file changed, 3 insertions(+), 6 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/53/853/1

diff --git a/asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/ClusterStateWatcher.java b/asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/ClusterStateWatcher.java
index 2ef8697..f823404 100644
--- a/asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/ClusterStateWatcher.java
+++ b/asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/ClusterStateWatcher.java
@@ -25,8 +25,8 @@
 
 //A zookeeper watcher that watches the change in the state of the cluster
 public class ClusterStateWatcher implements Watcher {
-    private static Integer mutex;
-    private static ZooKeeper zk;
+    private final Object mutex = new Object();
+    private final ZooKeeper zk;
     private String clusterStatePath;
     private boolean done = false;
     private ClusterState clusterState = ClusterState.STARTING;
@@ -35,12 +35,9 @@
     private static Logger LOGGER = Logger.getLogger(ClusterStateWatcher.class.getName());
 
     public ClusterStateWatcher(ZooKeeper zk, String clusterName) {
-        if (mutex == null) {
-            mutex = new Integer(-1);
-        }
         this.clusterStatePath = ZooKeeperService.ASTERIX_INSTANCE_BASE_PATH + File.separator + clusterName
                 + ZooKeeperService.ASTERIX_INSTANCE_STATE_PATH;
-        ClusterStateWatcher.zk = zk;
+        this.zk = zk;
     }
 
     public ClusterState waitForClusterStart() throws Exception {

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/853
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I520582cb5a03d775d696ec5b4390b571322e18f7
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>

Change in asterixdb[master]: SONAR: Synchronization On Boxed Primitives

Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.

Change subject: SONAR: Synchronization On Boxed Primitives
......................................................................


Patch Set 1:

Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/1359/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/853
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I520582cb5a03d775d696ec5b4390b571322e18f7
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: abdullah alamoudi <ba...@gmail.com>
Gerrit-HasComments: No

Change in asterixdb[master]: SONAR: Synchronization On Boxed Primitives

Posted by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org>.
Michael Blow has submitted this change and it was merged.

Change subject: SONAR: Synchronization On Boxed Primitives
......................................................................


SONAR: Synchronization On Boxed Primitives

Synchronization should not be based on Strings or boxed primitives

Fixes:
 - https://asterix-sonar.ics.uci.edu/issues/search#issues=AVR98lUKuXNBBqjTzg_N
 - https://asterix-sonar.ics.uci.edu/issues/search#issues=AVR98lUKuXNBBqjTzg_O
 - https://asterix-sonar.ics.uci.edu/issues/search#issues=AVR98lUKuXNBBqjTzg_P

Change-Id: I520582cb5a03d775d696ec5b4390b571322e18f7
Reviewed-on: https://asterix-gerrit.ics.uci.edu/853
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: abdullah alamoudi <ba...@gmail.com>
---
M asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/ClusterStateWatcher.java
1 file changed, 3 insertions(+), 6 deletions(-)

Approvals:
  abdullah alamoudi: Looks good to me, approved
  Jenkins: Verified



diff --git a/asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/ClusterStateWatcher.java b/asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/ClusterStateWatcher.java
index 2ef8697..f823404 100644
--- a/asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/ClusterStateWatcher.java
+++ b/asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/ClusterStateWatcher.java
@@ -25,8 +25,8 @@
 
 //A zookeeper watcher that watches the change in the state of the cluster
 public class ClusterStateWatcher implements Watcher {
-    private static Integer mutex;
-    private static ZooKeeper zk;
+    private final Object mutex = new Object();
+    private final ZooKeeper zk;
     private String clusterStatePath;
     private boolean done = false;
     private ClusterState clusterState = ClusterState.STARTING;
@@ -35,12 +35,9 @@
     private static Logger LOGGER = Logger.getLogger(ClusterStateWatcher.class.getName());
 
     public ClusterStateWatcher(ZooKeeper zk, String clusterName) {
-        if (mutex == null) {
-            mutex = new Integer(-1);
-        }
         this.clusterStatePath = ZooKeeperService.ASTERIX_INSTANCE_BASE_PATH + File.separator + clusterName
                 + ZooKeeperService.ASTERIX_INSTANCE_STATE_PATH;
-        ClusterStateWatcher.zk = zk;
+        this.zk = zk;
     }
 
     public ClusterState waitForClusterStart() throws Exception {

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/853
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I520582cb5a03d775d696ec5b4390b571322e18f7
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: abdullah alamoudi <ba...@gmail.com>

Change in asterixdb[master]: SONAR: Synchronization On Boxed Primitives

Posted by "abdullah alamoudi (Code Review)" <do...@asterixdb.incubator.apache.org>.
abdullah alamoudi has posted comments on this change.

Change subject: SONAR: Synchronization On Boxed Primitives
......................................................................


Patch Set 1: Code-Review+2

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/853
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I520582cb5a03d775d696ec5b4390b571322e18f7
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: abdullah alamoudi <ba...@gmail.com>
Gerrit-HasComments: No

Change in asterixdb[master]: SONAR: Synchronization On Boxed Primitives

Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.

Change subject: SONAR: Synchronization On Boxed Primitives
......................................................................


Patch Set 1: Verified+1

Build Successful 

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/1359/ : SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/853
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I520582cb5a03d775d696ec5b4390b571322e18f7
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: abdullah alamoudi <ba...@gmail.com>
Gerrit-HasComments: No