cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Sat, 26 Aug 2017 00:26:35 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.11
Commit: 95f1b23bf0405ffdee1d4372980b0106d0c83071
Parents: cf0b6d1 c6dec2f
Author: Aleksey Yeschenko <aleksey@yeschenko.com>
Authored: Sat Aug 26 01:25:39 2017 +0100
Committer: Aleksey Yeschenko <aleksey@yeschenko.com>
Committed: Sat Aug 26 01:25:39 2017 +0100

----------------------------------------------------------------------
 src/java/org/apache/cassandra/batchlog/BatchlogManagerMBean.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f1b23b/src/java/org/apache/cassandra/batchlog/BatchlogManagerMBean.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/batchlog/BatchlogManagerMBean.java
index 4dcc9f2,0000000..371b6a8
mode 100644,000000..100644
--- a/src/java/org/apache/cassandra/batchlog/BatchlogManagerMBean.java
+++ b/src/java/org/apache/cassandra/batchlog/BatchlogManagerMBean.java
@@@ -1,38 -1,0 +1,38 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + *     http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.cassandra.batchlog;
 +
 +public interface BatchlogManagerMBean
 +{
 +    /**
 +     * Counts all batches currently in the batchlog.
 +     *
 +     * @return total batch count
 +     */
 +    public int countAllBatches();
 +
 +    /**
 +     * @return total count of batches replayed since node start
 +     */
 +    public long getTotalBatchesReplayed();
 +
 +    /**
-      * Forces batchlog replay. Returns immediately if replay is already in progress.
++     * Forces batchlog replay. Blocks until completion.
 +     */
 +    public void forceBatchlogReplay() throws Exception;
 +}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message