cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [2/3] git commit: Remove sync repair JMX interface
Date Fri, 21 Mar 2014 20:15:21 GMT
Remove sync repair JMX interface

patch by yukim; reviewed by jbellis for CASSANDRA-6900


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/21a1d525
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21a1d525
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21a1d525

Branch: refs/heads/trunk
Commit: 21a1d525bd97de6f5ae0e5c54d779fbcfb733e96
Parents: 35b7da4
Author: Yuki Morishita <yukim@apache.org>
Authored: Fri Mar 21 15:14:26 2014 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Fri Mar 21 15:14:26 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cassandra/service/StorageService.java       | 34 --------------------
 .../cassandra/service/StorageServiceMBean.java  | 24 --------------
 .../org/apache/cassandra/tools/NodeProbe.java   | 15 ---------
 4 files changed, 1 insertion(+), 73 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/21a1d525/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 21d4d5a..1b39e30 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -28,6 +28,7 @@
  * Update native server to Netty 4 (CASSANDRA-6236)
  * Fix off-by-one error in stress (CASSANDRA-6883)
  * Make OpOrder AutoCloseable (CASSANDRA-6901)
+ * Remove sync repair JMX interface (CASSANDRA-6900)
 Merged from 2.0:
  * Allow deleting snapshots from dropped keyspaces (CASSANDRA-6821)
  * Add uuid() function (CASSANDRA-6473)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/21a1d525/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 16d8628..57fbaf0 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2531,40 +2531,6 @@ public class StorageService extends NotificationBroadcasterSupport
implements IE
         return forceRepairAsync(keyspaceName, isSequential, isLocal, Collections.singleton(new
Range<Token>(parsedBeginToken, parsedEndToken)), fullRepair, columnFamilies);
     }
 
-
-    /**
-     * Trigger proactive repair for a keyspace and column families.
-     * @param keyspaceName
-     * @param columnFamilies
-     * @throws IOException
-     */
-    public void forceKeyspaceRepair(final String keyspaceName, boolean isSequential, boolean
isLocal, boolean fullRepair, final String... columnFamilies) throws IOException
-    {
-        forceKeyspaceRepairRange(keyspaceName, getLocalRanges(keyspaceName), isSequential,
isLocal, fullRepair, columnFamilies);
-    }
-
-    public void forceKeyspaceRepairPrimaryRange(final String keyspaceName, boolean isSequential,
boolean isLocal, boolean fullRepair, final String... columnFamilies) throws IOException
-    {
-        forceKeyspaceRepairRange(keyspaceName, getLocalPrimaryRanges(keyspaceName), isSequential,
isLocal, fullRepair, columnFamilies);
-    }
-
-    public void forceKeyspaceRepairRange(String beginToken, String endToken, final String
keyspaceName, boolean isSequential, boolean isLocal, boolean fullRepair, final String... columnFamilies)
throws IOException
-    {
-        Token parsedBeginToken = getPartitioner().getTokenFactory().fromString(beginToken);
-        Token parsedEndToken = getPartitioner().getTokenFactory().fromString(endToken);
-
-        logger.info("starting user-requested repair of range ({}, {}] for keyspace {} and
column families {}",
-                    parsedBeginToken, parsedEndToken, keyspaceName, columnFamilies);
-        forceKeyspaceRepairRange(keyspaceName, Collections.singleton(new Range<Token>(parsedBeginToken,
parsedEndToken)), isSequential, isLocal, fullRepair, columnFamilies);
-    }
-
-    public void forceKeyspaceRepairRange(final String keyspaceName, final Collection<Range<Token>>
ranges, boolean isSequential, boolean isLocal, boolean fullRepair, final String... columnFamilies)
throws IOException
-    {
-        if (Keyspace.SYSTEM_KS.equalsIgnoreCase(keyspaceName))
-            return;
-        createRepairTask(nextRepairCommand.incrementAndGet(), keyspaceName, ranges, isSequential,
isLocal, fullRepair, columnFamilies).run();
-    }
-
     private FutureTask<Object> createRepairTask(final int cmd,
                                                 final String keyspace,
                                                 final Collection<Range<Token>>
ranges,

http://git-wip-us.apache.org/repos/asf/cassandra/blob/21a1d525/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 efe7b06..aab8dcb 100644
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@ -279,7 +279,6 @@ public interface StorageServiceMBean extends NotificationEmitter
      */
     public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName,
boolean isSequential, Collection<String> dataCenters, Collection<String> hosts,
boolean repairedAt, String... columnFamilies) throws IOException;
 
-
     /**
      * Invoke repair asynchronously.
      * You can track repair progress by subscribing JMX notification sent from this StorageServiceMBean.
@@ -288,7 +287,6 @@ public interface StorageServiceMBean extends NotificationEmitter
      *   userObject: int array of length 2, [0]=command number, [1]=ordinal of AntiEntropyService.Status
      *
      * @return Repair command number, or 0 if nothing to repair
-     * @see #forceKeyspaceRepair(String, boolean, boolean, boolean, String...)
      */
     public int forceRepairAsync(String keyspace, boolean isSequential, boolean isLocal, boolean
primaryRange, boolean fullRepair, String... columnFamilies);
 
@@ -297,28 +295,6 @@ public interface StorageServiceMBean extends NotificationEmitter
      */
     public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName,
boolean isSequential, boolean isLocal, boolean repairedAt, String... columnFamilies);
 
-    /**
-     * Triggers proactive repair for given column families, or all columnfamilies for the
given keyspace
-     * if none are explicitly listed.
-     * @param keyspaceName
-     * @param columnFamilies
-     * @throws IOException
-     */
-    public void forceKeyspaceRepair(String keyspaceName, boolean isSequential, boolean isLocal,
boolean repairedAt, String... columnFamilies) throws IOException;
-
-    /**
-     * Triggers proactive repair but only for the node primary range.
-     */
-    public void forceKeyspaceRepairPrimaryRange(String keyspaceName, boolean isSequential,
boolean isLocal, boolean repairedAt, String... columnFamilies) throws IOException;
-
-    /**
-     * Perform repair of a specific range.
-     *
-     * This allows incremental repair to be performed by having an external controller submitting
repair jobs.
-     * Note that the provided range much be a subset of one of the node local range.
-     */
-    public void forceKeyspaceRepairRange(String beginToken, String endToken, String keyspaceName,
boolean isSequential, boolean isLocal, boolean repairedAt, String... columnFamilies) throws
IOException;
-
     public void forceTerminateAllRepairSessions();
 
     /**

http://git-wip-us.apache.org/repos/asf/cassandra/blob/21a1d525/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java
index 5cca56e..d4cef15 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -245,11 +245,6 @@ public class NodeProbe implements AutoCloseable
         ssProxy.forceKeyspaceFlush(keyspaceName, columnFamilies);
     }
 
-    public void forceKeyspaceRepair(String keyspaceName, boolean isSequential, boolean isLocal,
boolean fullRepair, String... columnFamilies) throws IOException
-    {
-        ssProxy.forceKeyspaceRepair(keyspaceName, isSequential, isLocal, fullRepair, columnFamilies);
-    }
-
     public void forceRepairAsync(final PrintStream out, final String keyspaceName, boolean
isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean
primaryRange, boolean fullRepair, String... columnFamilies) throws IOException
     {
         RepairRunner runner = new RepairRunner(out, keyspaceName, columnFamilies);
@@ -306,16 +301,6 @@ public class NodeProbe implements AutoCloseable
         }
     }
 
-    public void forceKeyspaceRepairPrimaryRange(String keyspaceName, boolean isSequential,
boolean isLocal, boolean fullRepair, String... columnFamilies) throws IOException
-    {
-        ssProxy.forceKeyspaceRepairPrimaryRange(keyspaceName, isSequential, isLocal, fullRepair,
columnFamilies);
-    }
-
-    public void forceKeyspaceRepairRange(String beginToken, String endToken, String keyspaceName,
boolean isSequential, boolean isLocal, boolean fullRepair, String... columnFamilies) throws
IOException
-    {
-        ssProxy.forceKeyspaceRepairRange(beginToken, endToken, keyspaceName, isSequential,
isLocal, fullRepair, columnFamilies);
-    }
-
     public void invalidateCounterCache()
     {
         cacheService.invalidateCounterCache();


Mime
View raw message