Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 489FD1888B for ; Mon, 30 Nov 2015 16:32:12 +0000 (UTC) Received: (qmail 43268 invoked by uid 500); 30 Nov 2015 16:32:11 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 43155 invoked by uid 500); 30 Nov 2015 16:32:11 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 42743 invoked by uid 99); 30 Nov 2015 16:32:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Nov 2015 16:32:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 42A31E0948; Mon, 30 Nov 2015 16:32:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Mon, 30 Nov 2015 16:32:13 -0000 Message-Id: <5b1f5c3947cf4f8285beac30a81d6d27@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [03/10] cassandra git commit: Add deprecation messages to StorageServiceMBean.forceRepair* methods Add deprecation messages to StorageServiceMBean.forceRepair* methods Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a013f3e0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a013f3e0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a013f3e0 Branch: refs/heads/cassandra-3.1 Commit: a013f3e05aebb3e4b6c4d2a19bbd6f2a95df6208 Parents: 0ee8895 Author: Paulo Motta Authored: Mon Nov 30 07:51:41 2015 -0800 Committer: Yuki Morishita Committed: Mon Nov 30 10:30:27 2015 -0600 ---------------------------------------------------------------------- .../cassandra/service/StorageServiceMBean.java | 22 +++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a013f3e0/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 00060ae..b7784d6 100644 --- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java +++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java @@ -299,8 +299,11 @@ public interface StorageServiceMBean extends NotificationEmitter */ public int repairAsync(String keyspace, Map options); + /** + * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead. + */ @Deprecated - public int forceRepairAsync(String keyspace, boolean isSequential, Collection dataCenters, Collection hosts, boolean primaryRange, boolean repairedAt, String... columnFamilies) throws IOException; + public int forceRepairAsync(String keyspace, boolean isSequential, Collection dataCenters, Collection hosts, boolean primaryRange, boolean fullRepair, String... columnFamilies) throws IOException; /** * Invoke repair asynchronously. @@ -309,28 +312,41 @@ public interface StorageServiceMBean extends NotificationEmitter * type: "repair" * userObject: int array of length 2, [0]=command number, [1]=ordinal of ActiveRepairService.Status * + * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead. + * * @param parallelismDegree 0: sequential, 1: parallel, 2: DC parallel * @return Repair command number, or 0 if nothing to repair */ @Deprecated public int forceRepairAsync(String keyspace, int parallelismDegree, Collection dataCenters, Collection hosts, boolean primaryRange, boolean fullRepair, String... columnFamilies); + /** + * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead. + */ @Deprecated - public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, Collection dataCenters, Collection hosts, boolean repairedAt, String... columnFamilies) throws IOException; + public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, Collection dataCenters, Collection hosts, boolean fullRepair, String... columnFamilies) throws IOException; /** * Same as forceRepairAsync, but handles a specified range * + * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead. + * * @param parallelismDegree 0: sequential, 1: parallel, 2: DC parallel */ @Deprecated public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, int parallelismDegree, Collection dataCenters, Collection hosts, boolean fullRepair, String... columnFamilies); + /** + * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead. + */ @Deprecated public int forceRepairAsync(String keyspace, boolean isSequential, boolean isLocal, boolean primaryRange, boolean fullRepair, String... columnFamilies); + /** + * @deprecated use {@link #repairAsync(String keyspace, Map options)} instead. + */ @Deprecated - public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, boolean isLocal, boolean repairedAt, String... columnFamilies); + public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, boolean isLocal, boolean fullRepair, String... columnFamilies); public void forceTerminateAllRepairSessions();