You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2015/10/01 15:13:33 UTC
[1/4] cassandra git commit: Keep StorageServiceMBean interface stable
Repository: cassandra
Updated Branches:
refs/heads/trunk a29778a4b -> f1e45028d
Keep StorageServiceMBean interface stable
Patch by Carl Yeksigian, reviewed by Stefania for CASSANDRA-10382
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/92c57879
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92c57879
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92c57879
Branch: refs/heads/trunk
Commit: 92c57879f7148e86574aedd259cbdce2ec988a31
Parents: 31fc6d2
Author: Carl Yeksigian <ca...@apache.org>
Authored: Wed Sep 30 12:33:42 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Thu Oct 1 09:05:08 2015 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 5 +++++
src/java/org/apache/cassandra/service/StorageServiceMBean.java | 4 ++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92c57879/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 8a2e71e..d5730d5 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1416,6 +1416,11 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return getTokenMetadata().getHostId(FBUtilities.getBroadcastAddress()).toString();
}
+ public Map<String, String> getHostIdMap()
+ {
+ return getEndpointToHostId();
+ }
+
public Map<String, String> getEndpointToHostId()
{
Map<String, String> mapOut = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/92c57879/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 7e74947..b8582a3 100644
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@ -158,6 +158,10 @@ public interface StorageServiceMBean extends NotificationEmitter
/** Retrieve this hosts unique ID */
public String getLocalHostId();
+ /** {@link StorageServiceMBean#getEndpointToHostId} */
+ @Deprecated
+ public Map<String, String> getHostIdMap();
+
/** Retrieve the mapping of endpoint to host ID */
public Map<String, String> getEndpointToHostId();
[4/4] cassandra git commit: merge branch 'cassandra-3.0' into trunk
Posted by ja...@apache.org.
merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f1e45028
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1e45028
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f1e45028
Branch: refs/heads/trunk
Commit: f1e45028dec2b46691d68e50ed2a565de573411d
Parents: a29778a 80355a1
Author: T Jake Luciani <ja...@apache.org>
Authored: Thu Oct 1 09:13:18 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Thu Oct 1 09:13:18 2015 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 7 ++++++-
.../org/apache/cassandra/service/StorageServiceMBean.java | 4 ++++
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[3/4] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ja...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/80355a10
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/80355a10
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/80355a10
Branch: refs/heads/trunk
Commit: 80355a105f5b7552b2ecd40939b83ff47d7eea56
Parents: 1f99e70 74bc1cc
Author: T Jake Luciani <ja...@apache.org>
Authored: Thu Oct 1 09:12:36 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Thu Oct 1 09:12:36 2015 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 7 ++++++-
.../org/apache/cassandra/service/StorageServiceMBean.java | 4 ++++
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/80355a10/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 76299b7,d426cbc..9153cd8
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -405,10 -421,10 +405,10 @@@ public class StorageService extends Not
{
throw new IllegalStateException("No configured daemon");
}
-
+
try
{
- daemon.nativeServer.start();
+ daemon.startNativeTransport();
}
catch (Exception e)
{
@@@ -1571,11 -1555,11 +1571,16 @@@
return getTokenMetadata().getHostId(FBUtilities.getBroadcastAddress()).toString();
}
+ public UUID getLocalHostUUID()
+ {
+ return getTokenMetadata().getHostId(FBUtilities.getBroadcastAddress());
+ }
+
+ public Map<String, String> getHostIdMap()
+ {
+ return getEndpointToHostId();
+ }
+
public Map<String, String> getEndpointToHostId()
{
Map<String, String> mapOut = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/80355a10/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
[2/4] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ja...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74bc1cc7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74bc1cc7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74bc1cc7
Branch: refs/heads/trunk
Commit: 74bc1cc7dd1213d4176cd914274f706342287141
Parents: 8123b3b 92c5787
Author: T Jake Luciani <ja...@apache.org>
Authored: Thu Oct 1 09:10:37 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Thu Oct 1 09:10:37 2015 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 5 +++++
src/java/org/apache/cassandra/service/StorageServiceMBean.java | 4 ++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/74bc1cc7/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/74bc1cc7/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------