(cassandra) branch cassandra-19687 created (now 24fb418adb)
This is an automated email from the ASF dual-hosted git repository. aweisberg pushed a change to branch cassandra-19687 in repository https://gitbox.apache.org/repos/asf/cassandra.git at 24fb418adb ApplyThenWaitUntilApplied supplies wrong epoch for executeAtEpoch No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-19687 deleted (was 24fb418adb)
This is an automated email from the ASF dual-hosted git repository. aweisberg pushed a change to branch cassandra-19687 in repository https://gitbox.apache.org/repos/asf/cassandra.git was 24fb418adb ApplyThenWaitUntilApplied supplies wrong epoch for executeAtEpoch The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-accord) branch trunk updated (527094c6 -> 37c957c7)
This is an automated email from the ASF dual-hosted git repository. aweisberg pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-accord.git from 527094c6 Move burn test read timestamp validation from replica to coordination add 37c957c7 ApplyThenWaitUntilApplied supplies wrong epoch for executeAtEpoch No new revisions were added by this update. Summary of changes: .../java/accord/coordinate/ExecuteSyncPoint.java | 2 +- .../src/main/java/accord/local/Bootstrap.java | 6 +-- .../main/java/accord/local/SerializerSupport.java | 2 +- .../accord/messages/ApplyThenWaitUntilApplied.java | 12 ++--- .../src/main/java/accord/primitives/RangeDeps.java | 61 +- .../src/main/java/accord/primitives/SyncPoint.java | 2 +- .../java/accord/utils/CheckpointIntervalArray.java | 3 -- .../src/test/java/accord/burn/BurnTest.java| 27 +- .../src/test/java/accord/impl/list/ListStore.java | 13 +++-- .../java/accord/local/ImmutableCommandTest.java| 8 +-- .../test/java/accord/messages/PreAcceptTest.java | 17 +++--- .../test/java/accord/primitives/RangeDepsTest.java | 53 +-- 12 files changed, 143 insertions(+), 63 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cep-15-accord updated (f6e9d928a1 -> 24fb418adb)
This is an automated email from the ASF dual-hosted git repository. aweisberg pushed a change to branch cep-15-accord in repository https://gitbox.apache.org/repos/asf/cassandra.git from f6e9d928a1 Don't run incremental repairs for consensus only repairs add 24fb418adb ApplyThenWaitUntilApplied supplies wrong epoch for executeAtEpoch No new revisions were added by this update. Summary of changes: modules/accord | 2 +- .../apache/cassandra/index/accord/CheckpointIntervalArrayIndex.java| 2 ++ .../cassandra/service/accord/serializers/ReadDataSerializers.java | 3 --- 3 files changed, 3 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-accord) branch trunk updated (4aa0a8ae -> 129a4862)
This is an automated email from the ASF dual-hosted git repository.
aweisberg pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-accord.git
from 4aa0a8ae Fix test failures
add 51ee03ba Fix test failures
add 129a4862 Accord migration and interop correctness
No new revisions were added by this update.
Summary of changes:
accord-core/src/main/java/accord/api/Agent.java| 8 +-
.../src/main/java/accord/config/LocalConfig.java | 14 ++
.../coordinate/AbstractCoordinatePreAccept.java| 8 +-
.../accord/coordinate/CoordinatePreAccept.java | 7 +-
.../accord/coordinate/CoordinateSyncPoint.java | 4 +-
.../accord/coordinate/CoordinationAdapter.java | 9 +-
.../java/accord/coordinate/CoordinationFailed.java | 46 ++-
.../{Truncated.java => EpochTimeout.java} | 29 +++--
.../java/accord/coordinate/ExecuteSyncPoint.java | 2 +-
.../src/main/java/accord/coordinate/Exhausted.java | 16 ++-
.../src/main/java/accord/coordinate/FetchData.java | 66 ++
.../main/java/accord/coordinate/Invalidated.java | 16 ++-
.../src/main/java/accord/coordinate/Preempted.java | 14 ++
.../src/main/java/accord/coordinate/Propose.java | 7 +-
.../java/accord/coordinate/RangeUnavailable.java | 18 +++
.../java/accord/coordinate/ReadCoordinator.java| 14 +-
.../src/main/java/accord/coordinate/Recover.java | 60 +++--
.../java/accord/coordinate/RecoverWithRoute.java | 9 +-
.../src/main/java/accord/coordinate/Timeout.java | 16 ++-
.../java/accord/coordinate/TopologyMismatch.java | 16 ++-
.../src/main/java/accord/coordinate/Truncated.java | 14 ++
.../impl/CoordinateDurabilityScheduling.java | 18 ++-
.../main/java/accord/impl/SimpleProgressLog.java | 28 +++-
.../src/main/java/accord/local/Bootstrap.java | 12 +-
.../src/main/java/accord/local/Commands.java | 4 +-
accord-core/src/main/java/accord/local/Node.java | 52
.../main/java/accord/local/NodeTimeService.java| 54 ++--
.../src/main/java/accord/topology/Topology.java| 3 +-
.../main/java/accord/topology/TopologyManager.java | 141 +
accord-core/src/test/java/accord/Utils.java| 9 +-
.../coordinate/CoordinateTransactionTest.java | 4 +-
.../src/test/java/accord/impl/TestAgent.java | 4 +-
.../src/test/java/accord/impl/basic/Cluster.java | 2 +-
.../src/test/java/accord/impl/list/ListAgent.java | 2 +-
.../test/java/accord/impl/mock/MockCluster.java| 6 +-
.../java/accord/local/ImmutableCommandTest.java| 2 +-
.../java/accord/local/cfk/CommandsForKeyTest.java | 4 +-
.../java/accord/topology/TopologyManagerTest.java | 61 -
.../test/java/accord/utils/ExtendedAssertions.java | 8 +-
.../src/main/java/accord/maelstrom/Cluster.java| 2 +-
.../main/java/accord/maelstrom/MaelstromAgent.java | 5 +-
.../src/main/java/accord/maelstrom/Main.java | 2 +-
42 files changed, 610 insertions(+), 206 deletions(-)
copy accord-core/src/main/java/accord/coordinate/{Truncated.java =>
EpochTimeout.java} (63%)
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cep-15-accord updated: ninja fix imports failing checkstyle
This is an automated email from the ASF dual-hosted git repository. aweisberg pushed a commit to branch cep-15-accord in repository https://gitbox.apache.org/repos/asf/cassandra.git The following commit(s) were added to refs/heads/cep-15-accord by this push: new 07207aa26e ninja fix imports failing checkstyle 07207aa26e is described below commit 07207aa26efd876b3c0f7fd6a3dceb7914f0cb52 Author: Ariel Weisberg AuthorDate: Mon Aug 19 11:20:22 2024 -0400 ninja fix imports failing checkstyle --- .../org/apache/cassandra/distributed/test/TestBaseImpl.java | 1 - .../distributed/test/accord/AccordMigrationRaceTestBase.java | 2 +- .../apache/cassandra/distributed/test/accord/AccordMigrationTest.java | 2 -- .../distributed/test/accord/AccordTimestampPreservationTest.java | 4 ++-- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/test/distributed/org/apache/cassandra/distributed/test/TestBaseImpl.java b/test/distributed/org/apache/cassandra/distributed/test/TestBaseImpl.java index 2d71f94862..c529834204 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/TestBaseImpl.java +++ b/test/distributed/org/apache/cassandra/distributed/test/TestBaseImpl.java @@ -67,7 +67,6 @@ import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.distributed.api.NodeToolResult; import org.apache.cassandra.distributed.shared.DistributedTestBase; import org.apache.cassandra.service.accord.AccordStateCache; -import org.assertj.core.api.Fail; import static java.lang.System.currentTimeMillis; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationRaceTestBase.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationRaceTestBase.java index b17ff97060..e5865ef9d3 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationRaceTestBase.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationRaceTestBase.java @@ -91,7 +91,6 @@ import org.apache.cassandra.utils.concurrent.Promise; import org.eclipse.jetty.util.ConcurrentHashSet; import static java.lang.String.format; -import static junit.framework.TestCase.assertEquals; import static org.apache.cassandra.Util.expectException; import static org.apache.cassandra.Util.spinAssertEquals; import static org.apache.cassandra.config.CassandraRelevantProperties.HINT_DISPATCH_INTERVAL_MS; @@ -108,6 +107,7 @@ import static org.apache.cassandra.distributed.test.accord.AccordMigrationRaceTe import static org.apache.cassandra.distributed.util.QueryResultUtil.assertThat; import static org.apache.cassandra.exceptions.RequestFailureReason.RETRY_ON_DIFFERENT_TRANSACTION_SYSTEM; import static org.apache.cassandra.utils.Throwables.runUnchecked; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationTest.java index 26a5862c2c..7a95f99df2 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationTest.java @@ -21,7 +21,6 @@ package org.apache.cassandra.distributed.test.accord; import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.Arrays; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; @@ -62,7 +61,6 @@ import org.apache.cassandra.dht.Token; import org.apache.cassandra.distributed.api.Feature; import org.apache.cassandra.distributed.api.ICoordinator; import org.apache.cassandra.distributed.api.IInvokableInstance; -import org.apache.cassandra.distributed.api.NodeToolResult; import org.apache.cassandra.distributed.api.Row; import org.apache.cassandra.distributed.api.SimpleQueryResult; import org.apache.cassandra.gms.EndpointState; diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordTimestampPreservationTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordTimestampPreservationTest.java index 24223cd467..353c591c6d 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordTimestampPreservationTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordTimestampPreservationTest.java @@ -48,11 +48,11 @@ import org.apache.cassandra.service.consensus.migration.ConsensusKeyMigrationSta import org.apache.cassandra.service.consensus.migration.ConsensusRequestRouter; import static java.lang.String.format; -import static junit.framework.TestCase.assertEquals; -import static junit.framework.TestCase.fail; import static
(cassandra) branch trunk updated (09c803ec78 -> 5deb406bec)
This is an automated email from the ASF dual-hosted git repository. aweisberg pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git from 09c803ec78 Merge branch 'cassandra-5.0' into trunk add 6da9141d3c Fix latency reported by ideal consistency level monitoring add 02f38208b1 Merge branch 'cassandra-4.0' into cassandra-4.1 add f7d407ba31 Merge branch 'cassandra-4.1' into cassandra-5.0 add 5deb406bec Merge branch 'cassandra-5.0' into trunk No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../service/AbstractWriteResponseHandler.java | 19 --- .../service/WriteResponseHandlerTest.java | 59 +- 3 files changed, 71 insertions(+), 8 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-5.0 updated (44df291354 -> f7d407ba31)
This is an automated email from the ASF dual-hosted git repository. aweisberg pushed a change to branch cassandra-5.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 44df291354 Merge branch 'cassandra-5.0.0' into cassandra-5.0 add 6da9141d3c Fix latency reported by ideal consistency level monitoring add 02f38208b1 Merge branch 'cassandra-4.0' into cassandra-4.1 add f7d407ba31 Merge branch 'cassandra-4.1' into cassandra-5.0 No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../service/AbstractWriteResponseHandler.java | 19 --- .../service/WriteResponseHandlerTest.java | 59 +- 3 files changed, 71 insertions(+), 8 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.1 updated (e5fc9b3e14 -> 02f38208b1)
This is an automated email from the ASF dual-hosted git repository. aweisberg pushed a change to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git from e5fc9b3e14 Merge branch 'cassandra-4.0' into cassandra-4.1 add 6da9141d3c Fix latency reported by ideal consistency level monitoring add 02f38208b1 Merge branch 'cassandra-4.0' into cassandra-4.1 No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../service/AbstractWriteResponseHandler.java | 19 --- .../service/WriteResponseHandlerTest.java | 59 +- 3 files changed, 71 insertions(+), 8 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cassandra-4.0 updated (93415c91af -> 6da9141d3c)
This is an automated email from the ASF dual-hosted git repository. aweisberg pushed a change to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git from 93415c91af Use default commitlog settings in test YAMLs add 6da9141d3c Fix latency reported by ideal consistency level monitoring No new revisions were added by this update. Summary of changes: CHANGES.txt| 1 + .../service/AbstractWriteResponseHandler.java | 19 --- .../service/WriteResponseHandlerTest.java | 59 +- 3 files changed, 71 insertions(+), 8 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-accord) branch retry-new-system created (now 892f19d)
This is an automated email from the ASF dual-hosted git repository. aweisberg pushed a change to branch retry-new-system in repository https://gitbox.apache.org/repos/asf/cassandra-accord.git at 892f19d retry new system checkpoint This branch includes the following new commits: new 892f19d retry new system checkpoint The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-accord) 01/01: retry new system checkpoint
This is an automated email from the ASF dual-hosted git repository.
aweisberg pushed a commit to branch retry-new-system
in repository https://gitbox.apache.org/repos/asf/cassandra-accord.git
commit 892f19d7714bc7128d84b7e635acc6621ce476c4
Author: Ariel Weisberg
AuthorDate: Mon May 6 18:12:30 2024 -0400
retry new system checkpoint
---
accord-core/src/main/java/accord/local/Node.java | 18 ++--
.../main/java/accord/topology/TopologyManager.java | 120 +
accord-core/src/test/java/accord/Utils.java| 8 ++
.../java/accord/topology/TopologyManagerTest.java | 61 +--
4 files changed, 149 insertions(+), 58 deletions(-)
diff --git a/accord-core/src/main/java/accord/local/Node.java
b/accord-core/src/main/java/accord/local/Node.java
index 1605f43..62331d0 100644
--- a/accord-core/src/main/java/accord/local/Node.java
+++ b/accord-core/src/main/java/accord/local/Node.java
@@ -34,14 +34,7 @@ import java.util.function.Function;
import java.util.function.LongSupplier;
import java.util.function.Supplier;
import java.util.function.ToLongFunction;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import accord.coordinate.CoordinateEphemeralRead;
-import accord.coordinate.CoordinationAdapter;
-import accord.coordinate.CoordinationAdapter.Factory.Step;
-import accord.utils.DeterministicSet;
-import accord.utils.Invariants;
import com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,7 +51,10 @@ import accord.api.RoutingKey;
import accord.api.Scheduler;
import accord.api.TopologySorter;
import accord.config.LocalConfig;
+import accord.coordinate.CoordinateEphemeralRead;
import accord.coordinate.CoordinateTransaction;
+import accord.coordinate.CoordinationAdapter;
+import accord.coordinate.CoordinationAdapter.Factory.Step;
import accord.coordinate.MaybeRecover;
import accord.coordinate.Outcome;
import accord.coordinate.RecoverWithRoute;
@@ -85,12 +81,16 @@ import accord.primitives.Unseekables;
import accord.topology.Shard;
import accord.topology.Topology;
import accord.topology.TopologyManager;
+import accord.utils.DeterministicSet;
+import accord.utils.Invariants;
import accord.utils.MapReduceConsume;
import accord.utils.RandomSource;
import accord.utils.async.AsyncChain;
import accord.utils.async.AsyncExecutor;
import accord.utils.async.AsyncResult;
import accord.utils.async.AsyncResults;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import net.nicoulaj.compilecommand.annotations.Inline;
import static accord.utils.Invariants.illegalState;
@@ -179,7 +179,8 @@ public class Node implements ConfigurationService.Listener,
NodeTimeService
this.localRequestHandler = localRequestHandler;
this.configService = configService;
this.coordinationAdapters = coordinationAdapters;
-this.topology = new TopologyManager(topologySorter, id);
+this.topology = new TopologyManager(topologySorter, id, scheduler,
nowTimeUnit);
+topology.scheduleTopologyUpdateWatchdog();
this.nowSupplier = nowSupplier;
this.nowTimeUnit = nowTimeUnit;
this.now = new
AtomicReference<>(Timestamp.fromValues(topology.epoch(),
nowSupplier.getAsLong(), id));
@@ -330,6 +331,7 @@ public class Node implements ConfigurationService.Listener,
NodeTimeService
public void shutdown()
{
commandStores.shutdown();
+topology.shutdown();
}
public Timestamp uniqueNow()
diff --git a/accord-core/src/main/java/accord/topology/TopologyManager.java
b/accord-core/src/main/java/accord/topology/TopologyManager.java
index bd4b25a..d2f609e 100644
--- a/accord-core/src/main/java/accord/topology/TopologyManager.java
+++ b/accord-core/src/main/java/accord/topology/TopologyManager.java
@@ -23,14 +23,18 @@ import java.util.BitSet;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
+import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.function.Supplier;
+import java.util.function.ToLongFunction;
import com.google.common.annotations.VisibleForTesting;
import accord.api.ConfigurationService.EpochReady;
import accord.api.RoutingKey;
+import accord.api.Scheduler;
import accord.api.TopologySorter;
+import accord.coordinate.Timeout;
import accord.coordinate.TopologyMismatch;
import accord.coordinate.tracking.QuorumTracker;
import accord.local.CommandStore;
@@ -44,13 +48,14 @@ import accord.utils.Invariants;
import accord.utils.async.AsyncChain;
import accord.utils.async.AsyncResult;
import accord.utils.async.AsyncResults;
-
import javax.annotation.Nullable;
+import javax.annotation.concurrent.GuardedBy;
import static accord.coordinate.tracking.RequestStatus.Success;
import static accord.primitives.AbstractRanges.UnionMode.MERGE_ADJACENT;
import static accord.primitives.Routables.Slice.Minimal;
import
(cassandra-accord) branch retry-new-system deleted (was 892f19d7)
This is an automated email from the ASF dual-hosted git repository. aweisberg pushed a change to branch retry-new-system in repository https://gitbox.apache.org/repos/asf/cassandra-accord.git was 892f19d7 retry new system checkpoint This change permanently discards the following revisions: discard 892f19d7 retry new system checkpoint - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra-accord) branch trunk updated (778c45cd -> 4e8bcae8)
This is an automated email from the ASF dual-hosted git repository. aweisberg pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-accord.git from 778c45cd Baseline Diagnostic vtables for Accord add 4e8bcae8 Accord barrier/inclusive sync point fixes No new revisions were added by this update. Summary of changes: accord-core/src/main/java/accord/api/Agent.java| 6 +-- .../src/main/java/accord/coordinate/Barrier.java | 24 ++ .../accord/coordinate/CoordinateSyncPoint.java | 2 +- .../accord/coordinate/CoordinationAdapter.java | 56 ++ .../src/main/java/accord/local/Command.java| 1 - .../accord/messages/ApplyThenWaitUntilApplied.java | 3 +- .../src/main/java/accord/messages/Commit.java | 2 +- .../src/main/java/accord/primitives/Txn.java | 10 ++-- .../coordinate/CoordinateTransactionTest.java | 22 +++-- .../src/test/java/accord/impl/TestAgent.java | 9 ++-- .../accord/impl/basic/DelayedCommandStores.java| 6 +-- .../src/test/java/accord/impl/basic/NodeSink.java | 9 ++-- 12 files changed, 104 insertions(+), 46 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) branch cep-15-accord updated: Accord barrier/inclusive sync point fixes
This is an automated email from the ASF dual-hosted git repository.
aweisberg pushed a commit to branch cep-15-accord
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cep-15-accord by this push:
new aa55d9ed30 Accord barrier/inclusive sync point fixes
aa55d9ed30 is described below
commit aa55d9ed303cd0a5b9f338064af3533235ae8234
Author: Ariel Weisberg
AuthorDate: Fri May 17 15:27:44 2024 -0400
Accord barrier/inclusive sync point fixes
Patch by Ariel Weisberg, Benedict Elliott Smith; reviewed by Benedict
Elliott Smith for CASSANDRA-19641
---
.gitmodules| 4 +-
modules/accord | 2 +-
.../cassandra/service/accord/AccordService.java| 2 +-
.../cassandra/service/accord/api/AccordAgent.java | 10 +-
.../migration/ConsensusKeyMigrationState.java | 20 ++-
.../test/accord/AccordIncrementalRepairTest.java | 6 +-
.../test/accord/AccordMigrationTest.java | 169 ++---
7 files changed, 134 insertions(+), 79 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 616dacf610..0760881ad8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
[submodule "modules/accord"]
path = modules/accord
- url = https://github.com/apache/cassandra-accord.git
- branch = trunk
+ url = https://github.com/aweisberg/cassandra-accord.git
+ branch = cassandra-19641
diff --git a/modules/accord b/modules/accord
index 778c45cd97..4e8bcae81f 16
--- a/modules/accord
+++ b/modules/accord
@@ -1 +1 @@
-Subproject commit 778c45cd977576a901abf24a9759872d36fde056
+Subproject commit 4e8bcae81f9751b9d732fd5056bce31c97ad58f3
diff --git a/src/java/org/apache/cassandra/service/accord/AccordService.java
b/src/java/org/apache/cassandra/service/accord/AccordService.java
index f853c329c6..8e2778f394 100644
--- a/src/java/org/apache/cassandra/service/accord/AccordService.java
+++ b/src/java/org/apache/cassandra/service/accord/AccordService.java
@@ -366,7 +366,7 @@ public class AccordService implements IAccordService,
Shutdownable
{
logger.debug("Starting barrier key: {} epoch: {} barrierType: {}
isForWrite {}", keysOrRanges, epoch, barrierType, isForWrite);
txnId = node.nextTxnId(Kind.SyncPoint, keysOrRanges.domain());
-AsyncResult asyncResult = syncPoint == null
+AsyncResult asyncResult = syncPoint == null
? Barrier.barrier(node,
keysOrRanges, epoch, barrierType)
: Barrier.barrier(node,
keysOrRanges, epoch, barrierType, syncPoint);
long deadlineNanos = queryStartNanos + timeoutNanos;
diff --git a/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java
b/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java
index 9c4b678996..c0fea38a37 100644
--- a/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java
+++ b/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java
@@ -19,12 +19,11 @@
package org.apache.cassandra.service.accord.api;
import java.util.concurrent.TimeUnit;
+import javax.annotation.Nonnull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nonnull;
-
import accord.api.Agent;
import accord.api.EventsListener;
import accord.api.Result;
@@ -35,8 +34,9 @@ import accord.primitives.Seekables;
import accord.primitives.Timestamp;
import accord.primitives.Txn;
import accord.primitives.Txn.Kind;
-import org.apache.cassandra.service.accord.AccordService;
+import accord.primitives.TxnId;
import org.apache.cassandra.metrics.AccordMetrics;
+import org.apache.cassandra.service.accord.AccordService;
import org.apache.cassandra.service.accord.txn.TxnQuery;
import org.apache.cassandra.service.accord.txn.TxnRead;
import org.apache.cassandra.tcm.Epoch;
@@ -84,12 +84,12 @@ public class AccordAgent implements Agent
}
@Override
-public void onLocalBarrier(@Nonnull Seekables keysOrRanges, @Nonnull
Timestamp executeAt)
+public void onLocalBarrier(@Nonnull Seekables keysOrRanges, @Nonnull
TxnId txnId)
{
if (keysOrRanges.domain() == Key)
{
PartitionKey key = (PartitionKey)keysOrRanges.get(0);
-maybeSaveAccordKeyMigrationLocally(key,
Epoch.create(executeAt.epoch()));
+maybeSaveAccordKeyMigrationLocally(key,
Epoch.create(txnId.epoch()));
}
}
diff --git
a/src/java/org/apache/cassandra/service/consensus/migration/ConsensusKeyMigrationState.java
b/src/java/org/apache/cassandra/service/consensus/migration/ConsensusKeyMigrationState.java
index 068e46d4a4..86eb97ae06 100644
---
a/src/java/org/apache/cassandra/service/consensus/migration/ConsensusKeyMigrationState.java
+++
b/src/java/org/apache/cassandra/service
(cassandra) branch cep-15-accord updated (aa55d9ed30 -> 3b99044d6d)
This is an automated email from the ASF dual-hosted git repository. aweisberg pushed a change to branch cep-15-accord in repository https://gitbox.apache.org/repos/asf/cassandra.git discard aa55d9ed30 Accord barrier/inclusive sync point fixes new 3b99044d6d Accord barrier/inclusive sync point fixes This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (aa55d9ed30) \ N -- N -- N refs/heads/cep-15-accord (3b99044d6d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Accord barrier/inclusive sync point fixes
This is an automated email from the ASF dual-hosted git repository.
aweisberg pushed a commit to branch cep-15-accord
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 3b99044d6d5491304d4a25d8dcea54510cfd3215
Author: Ariel Weisberg
AuthorDate: Fri May 17 15:27:44 2024 -0400
Accord barrier/inclusive sync point fixes
Patch by Ariel Weisberg, Benedict Elliott Smith; reviewed by Benedict
Elliott Smith for CASSANDRA-19641
---
modules/accord | 2 +-
.../cassandra/service/accord/AccordService.java| 2 +-
.../cassandra/service/accord/api/AccordAgent.java | 10 +-
.../migration/ConsensusKeyMigrationState.java | 20 ++-
.../test/accord/AccordIncrementalRepairTest.java | 6 +-
.../test/accord/AccordMigrationTest.java | 169 ++---
6 files changed, 132 insertions(+), 77 deletions(-)
diff --git a/modules/accord b/modules/accord
index 778c45cd97..4e8bcae81f 16
--- a/modules/accord
+++ b/modules/accord
@@ -1 +1 @@
-Subproject commit 778c45cd977576a901abf24a9759872d36fde056
+Subproject commit 4e8bcae81f9751b9d732fd5056bce31c97ad58f3
diff --git a/src/java/org/apache/cassandra/service/accord/AccordService.java
b/src/java/org/apache/cassandra/service/accord/AccordService.java
index f853c329c6..8e2778f394 100644
--- a/src/java/org/apache/cassandra/service/accord/AccordService.java
+++ b/src/java/org/apache/cassandra/service/accord/AccordService.java
@@ -366,7 +366,7 @@ public class AccordService implements IAccordService,
Shutdownable
{
logger.debug("Starting barrier key: {} epoch: {} barrierType: {}
isForWrite {}", keysOrRanges, epoch, barrierType, isForWrite);
txnId = node.nextTxnId(Kind.SyncPoint, keysOrRanges.domain());
-AsyncResult asyncResult = syncPoint == null
+AsyncResult asyncResult = syncPoint == null
? Barrier.barrier(node,
keysOrRanges, epoch, barrierType)
: Barrier.barrier(node,
keysOrRanges, epoch, barrierType, syncPoint);
long deadlineNanos = queryStartNanos + timeoutNanos;
diff --git a/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java
b/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java
index 9c4b678996..c0fea38a37 100644
--- a/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java
+++ b/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java
@@ -19,12 +19,11 @@
package org.apache.cassandra.service.accord.api;
import java.util.concurrent.TimeUnit;
+import javax.annotation.Nonnull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nonnull;
-
import accord.api.Agent;
import accord.api.EventsListener;
import accord.api.Result;
@@ -35,8 +34,9 @@ import accord.primitives.Seekables;
import accord.primitives.Timestamp;
import accord.primitives.Txn;
import accord.primitives.Txn.Kind;
-import org.apache.cassandra.service.accord.AccordService;
+import accord.primitives.TxnId;
import org.apache.cassandra.metrics.AccordMetrics;
+import org.apache.cassandra.service.accord.AccordService;
import org.apache.cassandra.service.accord.txn.TxnQuery;
import org.apache.cassandra.service.accord.txn.TxnRead;
import org.apache.cassandra.tcm.Epoch;
@@ -84,12 +84,12 @@ public class AccordAgent implements Agent
}
@Override
-public void onLocalBarrier(@Nonnull Seekables keysOrRanges, @Nonnull
Timestamp executeAt)
+public void onLocalBarrier(@Nonnull Seekables keysOrRanges, @Nonnull
TxnId txnId)
{
if (keysOrRanges.domain() == Key)
{
PartitionKey key = (PartitionKey)keysOrRanges.get(0);
-maybeSaveAccordKeyMigrationLocally(key,
Epoch.create(executeAt.epoch()));
+maybeSaveAccordKeyMigrationLocally(key,
Epoch.create(txnId.epoch()));
}
}
diff --git
a/src/java/org/apache/cassandra/service/consensus/migration/ConsensusKeyMigrationState.java
b/src/java/org/apache/cassandra/service/consensus/migration/ConsensusKeyMigrationState.java
index 068e46d4a4..86eb97ae06 100644
---
a/src/java/org/apache/cassandra/service/consensus/migration/ConsensusKeyMigrationState.java
+++
b/src/java/org/apache/cassandra/service/consensus/migration/ConsensusKeyMigrationState.java
@@ -27,6 +27,8 @@ import javax.annotation.Nullable;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.primitives.Ints;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import accord.api.BarrierType;
import accord.primitives.Seekables;
@@ -68,9 +70,7 @@ import org.apache.cassandra.utils.Pair;
import org.apache.cassandra.utils.UUIDSerializer;
import static org.apache.cassandra.net.Verb.CONSENSUS_KEY_MIGRATION;
-
import static
org.apache.cassandra.service.consensus.migration.ConsensusMigrationTarget.paxos;
-
imp
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7afb97cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7afb97cb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7afb97cb Branch: refs/heads/cassandra-3.11 Commit: 7afb97cb664708e2f2874c80c628f7989f1c4fdb Parents: a2074b8 af20226 Author: Ariel Weisberg Authored: Thu Jun 29 16:11:31 2017 -0400 Committer: Ariel Weisberg Committed: Thu Jun 29 16:11:31 2017 -0400 -- CHANGES.txt | 1 + bin/cassandra | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7afb97cb/CHANGES.txt -- diff --cc CHANGES.txt index bab91e7,52b0027..096dfa4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,6 +1,7 @@@ -3.0.15 +3.11.1 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641) +Merged from 3.0: + * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557) - * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606) * Fix secondary index queries on COMPACT tables (CASSANDRA-13627) * Nodetool listsnapshots output is missing a newline, if there are no snapshots (CASSANDRA-13568) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7afb97cb/bin/cassandra -- - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Merge branch 'cassandra-3.11' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe3cfe3d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe3cfe3d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe3cfe3d Branch: refs/heads/trunk Commit: fe3cfe3d7df296f022c50c9c0d22f91a0fc0a217 Parents: 20d5ce8 7afb97c Author: Ariel Weisberg Authored: Thu Jun 29 16:12:35 2017 -0400 Committer: Ariel Weisberg Committed: Thu Jun 29 16:12:35 2017 -0400 -- CHANGES.txt | 1 + bin/cassandra | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe3cfe3d/CHANGES.txt -- diff --cc CHANGES.txt index 211769c,096dfa4..e56eb78 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -85,8 -1,9 +85,9 @@@ 3.11.1 * Properly evict pstmts from prepared statements cache (CASSANDRA-13641) Merged from 3.0: - * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557) - * Fix secondary index queries on COMPACT tables (CASSANDRA-13627) - * Nodetool listsnapshots output is missing a newline, if there are no snapshots (CASSANDRA-13568) ++ * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557) + * Fix secondary index queries on COMPACT tables (CASSANDRA-13627) + * Nodetool listsnapshots output is missing a newline, if there are no snapshots (CASSANDRA-13568) 3.11.0 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[3/6] cassandra git commit: Allow different NUMACTL_ARGS to be passed in
Allow different NUMACTL_ARGS to be passed in
Patch by Matt Byrd; Reviewed by Ariel Weisberg for CASSANDRA-13557
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af20226d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af20226d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af20226d
Branch: refs/heads/trunk
Commit: af20226dcadc6f15e245b3c786233d783d77b914
Parents: a1baead
Author: Matt Byrd
Authored: Thu Jun 29 15:57:09 2017 -0400
Committer: Ariel Weisberg
Committed: Thu Jun 29 15:57:09 2017 -0400
--
CHANGES.txt | 1 +
bin/cassandra | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/af20226d/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index c5179e7..52b0027 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.15
+ * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
* Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
* Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
* Nodetool listsnapshots output is missing a newline, if there are no
snapshots (CASSANDRA-13568)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/af20226d/bin/cassandra
--
diff --git a/bin/cassandra b/bin/cassandra
index 2dd0fe1..ae48ba4 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -107,7 +107,7 @@ fi
# avoid disk I/O. Even for the purpose of CPU efficiency, we don't
# really have CPU<->data affinity anyway. Also, empirically test that numactl
# works before trying to use it (CASSANDRA-3245).
-NUMACTL_ARGS="--interleave=all"
+NUMACTL_ARGS=${NUMACTL_ARGS:-"--interleave=all"}
if which numactl >/dev/null 2>/dev/null && numactl $NUMACTL_ARGS ls /
>/dev/null 2>/dev/null
then
NUMACTL="numactl $NUMACTL_ARGS"
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7afb97cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7afb97cb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7afb97cb Branch: refs/heads/trunk Commit: 7afb97cb664708e2f2874c80c628f7989f1c4fdb Parents: a2074b8 af20226 Author: Ariel Weisberg Authored: Thu Jun 29 16:11:31 2017 -0400 Committer: Ariel Weisberg Committed: Thu Jun 29 16:11:31 2017 -0400 -- CHANGES.txt | 1 + bin/cassandra | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7afb97cb/CHANGES.txt -- diff --cc CHANGES.txt index bab91e7,52b0027..096dfa4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,6 +1,7 @@@ -3.0.15 +3.11.1 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641) +Merged from 3.0: + * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557) - * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606) * Fix secondary index queries on COMPACT tables (CASSANDRA-13627) * Nodetool listsnapshots output is missing a newline, if there are no snapshots (CASSANDRA-13568) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7afb97cb/bin/cassandra -- - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[1/6] cassandra git commit: Allow different NUMACTL_ARGS to be passed in
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 a1baeadab -> af20226dc
refs/heads/cassandra-3.11 a2074b890 -> 7afb97cb6
refs/heads/trunk 20d5ce8b9 -> fe3cfe3d7
Allow different NUMACTL_ARGS to be passed in
Patch by Matt Byrd; Reviewed by Ariel Weisberg for CASSANDRA-13557
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af20226d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af20226d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af20226d
Branch: refs/heads/cassandra-3.0
Commit: af20226dcadc6f15e245b3c786233d783d77b914
Parents: a1baead
Author: Matt Byrd
Authored: Thu Jun 29 15:57:09 2017 -0400
Committer: Ariel Weisberg
Committed: Thu Jun 29 15:57:09 2017 -0400
--
CHANGES.txt | 1 +
bin/cassandra | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/af20226d/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index c5179e7..52b0027 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.15
+ * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
* Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
* Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
* Nodetool listsnapshots output is missing a newline, if there are no
snapshots (CASSANDRA-13568)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/af20226d/bin/cassandra
--
diff --git a/bin/cassandra b/bin/cassandra
index 2dd0fe1..ae48ba4 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -107,7 +107,7 @@ fi
# avoid disk I/O. Even for the purpose of CPU efficiency, we don't
# really have CPU<->data affinity anyway. Also, empirically test that numactl
# works before trying to use it (CASSANDRA-3245).
-NUMACTL_ARGS="--interleave=all"
+NUMACTL_ARGS=${NUMACTL_ARGS:-"--interleave=all"}
if which numactl >/dev/null 2>/dev/null && numactl $NUMACTL_ARGS ls /
>/dev/null 2>/dev/null
then
NUMACTL="numactl $NUMACTL_ARGS"
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[2/6] cassandra git commit: Allow different NUMACTL_ARGS to be passed in
Allow different NUMACTL_ARGS to be passed in
Patch by Matt Byrd; Reviewed by Ariel Weisberg for CASSANDRA-13557
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af20226d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af20226d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af20226d
Branch: refs/heads/cassandra-3.11
Commit: af20226dcadc6f15e245b3c786233d783d77b914
Parents: a1baead
Author: Matt Byrd
Authored: Thu Jun 29 15:57:09 2017 -0400
Committer: Ariel Weisberg
Committed: Thu Jun 29 15:57:09 2017 -0400
--
CHANGES.txt | 1 +
bin/cassandra | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/af20226d/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index c5179e7..52b0027 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.15
+ * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
* Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
* Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
* Nodetool listsnapshots output is missing a newline, if there are no
snapshots (CASSANDRA-13568)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/af20226d/bin/cassandra
--
diff --git a/bin/cassandra b/bin/cassandra
index 2dd0fe1..ae48ba4 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -107,7 +107,7 @@ fi
# avoid disk I/O. Even for the purpose of CPU efficiency, we don't
# really have CPU<->data affinity anyway. Also, empirically test that numactl
# works before trying to use it (CASSANDRA-3245).
-NUMACTL_ARGS="--interleave=all"
+NUMACTL_ARGS=${NUMACTL_ARGS:-"--interleave=all"}
if which numactl >/dev/null 2>/dev/null && numactl $NUMACTL_ARGS ls /
>/dev/null 2>/dev/null
then
NUMACTL="numactl $NUMACTL_ARGS"
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[3/6] cassandra git commit: Set test.runners based on cores and memory size
Set test.runners based on cores and memory size
patch by Jay Zhuang; reviewed by Ariel Weisberg for CASSANDRA-13078
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2400d07b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2400d07b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2400d07b
Branch: refs/heads/trunk
Commit: 2400d07bf52829b25a7c03c19b22ddd3301899be
Parents: 97fb4d1
Author: Jay Zhuang
Authored: Thu Jul 6 18:01:38 2017 -0700
Committer: Ariel Weisberg
Committed: Tue Jul 11 14:08:14 2017 -0400
--
CHANGES.txt | 1 +
build.xml | 58 +++-
circle.yml | 2 +-
3 files changed, 55 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2400d07b/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 8095e25..ce2324d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.15
+ * Set test.runners based on cores and memory size (CASSANDRA-13078)
* Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
* Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
* Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2400d07b/build.xml
--
diff --git a/build.xml b/build.xml
index 5eb6572..53c2cea 100644
--- a/build.xml
+++ b/build.xml
@@ -59,7 +59,6 @@
-
@@ -1625,12 +1624,25 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1933,4 +1980,5 @@
file="${build.dir}/${final.name}-javadoc.jar"
classifier="javadoc"/>
+
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2400d07b/circle.yml
--
diff --git a/circle.yml b/circle.yml
index 9d31277..f4801b7 100644
--- a/circle.yml
+++ b/circle.yml
@@ -7,7 +7,7 @@ test:
- sudo apt-get update; sudo apt-get install wamerican:
parallel: true
override:
-- case $CIRCLE_NODE_INDEX in 0) ant eclipse-warnings; ant test ;; 1) ant
long-test ;; 2) ant test-compression ;; 3) ant stress-test ;;esac:
+- case $CIRCLE_NODE_INDEX in 0) ant eclipse-warnings; ant test
-Dtest.runners=1;; 1) ant long-test ;; 2) ant test-compression ;; 3) ant
stress-test ;;esac:
parallel: true
post:
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[1/6] cassandra git commit: Set test.runners based on cores and memory size
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 97fb4d102 -> 2400d07bf
refs/heads/cassandra-3.11 48ffad89c -> e406700cf
refs/heads/trunk ebd0aaefe -> 19914dc1d
Set test.runners based on cores and memory size
patch by Jay Zhuang; reviewed by Ariel Weisberg for CASSANDRA-13078
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2400d07b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2400d07b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2400d07b
Branch: refs/heads/cassandra-3.0
Commit: 2400d07bf52829b25a7c03c19b22ddd3301899be
Parents: 97fb4d1
Author: Jay Zhuang
Authored: Thu Jul 6 18:01:38 2017 -0700
Committer: Ariel Weisberg
Committed: Tue Jul 11 14:08:14 2017 -0400
--
CHANGES.txt | 1 +
build.xml | 58 +++-
circle.yml | 2 +-
3 files changed, 55 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2400d07b/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 8095e25..ce2324d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.15
+ * Set test.runners based on cores and memory size (CASSANDRA-13078)
* Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
* Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
* Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2400d07b/build.xml
--
diff --git a/build.xml b/build.xml
index 5eb6572..53c2cea 100644
--- a/build.xml
+++ b/build.xml
@@ -59,7 +59,6 @@
-
@@ -1625,12 +1624,25 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1933,4 +1980,5 @@
file="${build.dir}/${final.name}-javadoc.jar"
classifier="javadoc"/>
+
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2400d07b/circle.yml
--
diff --git a/circle.yml b/circle.yml
index 9d31277..f4801b7 100644
--- a/circle.yml
+++ b/circle.yml
@@ -7,7 +7,7 @@ test:
- sudo apt-get update; sudo apt-get install wamerican:
parallel: true
override:
-- case $CIRCLE_NODE_INDEX in 0) ant eclipse-warnings; ant test ;; 1) ant
long-test ;; 2) ant test-compression ;; 3) ant stress-test ;;esac:
+- case $CIRCLE_NODE_INDEX in 0) ant eclipse-warnings; ant test
-Dtest.runners=1;; 1) ant long-test ;; 2) ant test-compression ;; 3) ant
stress-test ;;esac:
parallel: true
post:
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e406700c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e406700c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e406700c Branch: refs/heads/trunk Commit: e406700cf1118d30e2ef3230882020739eecac89 Parents: 48ffad8 2400d07 Author: Ariel Weisberg Authored: Tue Jul 11 14:10:55 2017 -0400 Committer: Ariel Weisberg Committed: Tue Jul 11 14:16:59 2017 -0400 -- CHANGES.txt | 2 ++ build.xml | 58 +++- circle.yml | 2 +- 3 files changed, 56 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e406700c/CHANGES.txt -- diff --cc CHANGES.txt index a66f4b3,ce2324d..dc22831 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,10 +1,12 @@@ +3.11.1 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641) +Merged from 3.0: + 3.0.15 + * Set test.runners based on cores and memory size (CASSANDRA-13078) * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557) - * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606) * Fix secondary index queries on COMPACT tables (CASSANDRA-13627) * Nodetool listsnapshots output is missing a newline, if there are no snapshots (CASSANDRA-13568) - Merged from 2.2: +Merged from 2.2: * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592) * Fix nested Tuples/UDTs validation (CASSANDRA-13646) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e406700c/build.xml -- diff --cc build.xml index c643b50,53c2cea..7a83949 --- a/build.xml +++ b/build.xml @@@ -1721,7 -1664,42 +1733,42 @@@ ]]> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - ++ - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[2/6] cassandra git commit: Set test.runners based on cores and memory size
Set test.runners based on cores and memory size
patch by Jay Zhuang; reviewed by Ariel Weisberg for CASSANDRA-13078
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2400d07b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2400d07b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2400d07b
Branch: refs/heads/cassandra-3.11
Commit: 2400d07bf52829b25a7c03c19b22ddd3301899be
Parents: 97fb4d1
Author: Jay Zhuang
Authored: Thu Jul 6 18:01:38 2017 -0700
Committer: Ariel Weisberg
Committed: Tue Jul 11 14:08:14 2017 -0400
--
CHANGES.txt | 1 +
build.xml | 58 +++-
circle.yml | 2 +-
3 files changed, 55 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2400d07b/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 8095e25..ce2324d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.15
+ * Set test.runners based on cores and memory size (CASSANDRA-13078)
* Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
* Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
* Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2400d07b/build.xml
--
diff --git a/build.xml b/build.xml
index 5eb6572..53c2cea 100644
--- a/build.xml
+++ b/build.xml
@@ -59,7 +59,6 @@
-
@@ -1625,12 +1624,25 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1933,4 +1980,5 @@
file="${build.dir}/${final.name}-javadoc.jar"
classifier="javadoc"/>
+
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2400d07b/circle.yml
--
diff --git a/circle.yml b/circle.yml
index 9d31277..f4801b7 100644
--- a/circle.yml
+++ b/circle.yml
@@ -7,7 +7,7 @@ test:
- sudo apt-get update; sudo apt-get install wamerican:
parallel: true
override:
-- case $CIRCLE_NODE_INDEX in 0) ant eclipse-warnings; ant test ;; 1) ant
long-test ;; 2) ant test-compression ;; 3) ant stress-test ;;esac:
+- case $CIRCLE_NODE_INDEX in 0) ant eclipse-warnings; ant test
-Dtest.runners=1;; 1) ant long-test ;; 2) ant test-compression ;; 3) ant
stress-test ;;esac:
parallel: true
post:
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e406700c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e406700c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e406700c Branch: refs/heads/cassandra-3.11 Commit: e406700cf1118d30e2ef3230882020739eecac89 Parents: 48ffad8 2400d07 Author: Ariel Weisberg Authored: Tue Jul 11 14:10:55 2017 -0400 Committer: Ariel Weisberg Committed: Tue Jul 11 14:16:59 2017 -0400 -- CHANGES.txt | 2 ++ build.xml | 58 +++- circle.yml | 2 +- 3 files changed, 56 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e406700c/CHANGES.txt -- diff --cc CHANGES.txt index a66f4b3,ce2324d..dc22831 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,10 +1,12 @@@ +3.11.1 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641) +Merged from 3.0: + 3.0.15 + * Set test.runners based on cores and memory size (CASSANDRA-13078) * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557) - * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606) * Fix secondary index queries on COMPACT tables (CASSANDRA-13627) * Nodetool listsnapshots output is missing a newline, if there are no snapshots (CASSANDRA-13568) - Merged from 2.2: +Merged from 2.2: * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592) * Fix nested Tuples/UDTs validation (CASSANDRA-13646) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e406700c/build.xml -- diff --cc build.xml index c643b50,53c2cea..7a83949 --- a/build.xml +++ b/build.xml @@@ -1721,7 -1664,42 +1733,42 @@@ ]]> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - ++ - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Merge branch 'cassandra-3.11' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/19914dc1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19914dc1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19914dc1 Branch: refs/heads/trunk Commit: 19914dc1d11ce545ade269afc2aaa2088a232c81 Parents: ebd0aae e406700 Author: Ariel Weisberg Authored: Tue Jul 11 14:28:12 2017 -0400 Committer: Ariel Weisberg Committed: Tue Jul 11 14:28:31 2017 -0400 -- CHANGES.txt | 7 --- build.xml | 58 +++- circle.yml | 2 +- 3 files changed, 58 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/19914dc1/CHANGES.txt -- diff --cc CHANGES.txt index e1589d5,dc22831..1b9d246 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -97,9 -1,11 +97,10 @@@ 3.11.1 * Properly evict pstmts from prepared statements cache (CASSANDRA-13641) Merged from 3.0: - * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557) - * Fix secondary index queries on COMPACT tables (CASSANDRA-13627) - * Nodetool listsnapshots output is missing a newline, if there are no snapshots (CASSANDRA-13568) -3.0.15 + * Set test.runners based on cores and memory size (CASSANDRA-13078) + * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557) + * Fix secondary index queries on COMPACT tables (CASSANDRA-13627) + * Nodetool listsnapshots output is missing a newline, if there are no snapshots (CASSANDRA-13568) Merged from 2.2: * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592) * Fix nested Tuples/UDTs validation (CASSANDRA-13646) http://git-wip-us.apache.org/repos/asf/cassandra/blob/19914dc1/build.xml -- - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
cassandra-dtest git commit: dtest failure in offline_tools_test.TestOfflineTools.sstableofflinerelevel_test
Repository: cassandra-dtest
Updated Branches:
refs/heads/master f1b0ba8a1 -> cc355ff25
dtest failure in offline_tools_test.TestOfflineTools.sstableofflinerelevel_test
Patch by Ariel Weisberg; Reviewed by Philip Thompson for CASSANDRA-12617
Project: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/commit/cc355ff2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/tree/cc355ff2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/diff/cc355ff2
Branch: refs/heads/master
Commit: cc355ff255f6b44f6b9b77dfd18a586885e2200a
Parents: f1b0ba8
Author: Ariel Weisberg
Authored: Wed Jul 12 18:38:05 2017 -0400
Committer: Ariel Weisberg
Committed: Wed Jul 12 18:38:05 2017 -0400
--
offline_tools_test.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra-dtest/blob/cc355ff2/offline_tools_test.py
--
diff --git a/offline_tools_test.py b/offline_tools_test.py
index c0a0010..028027d 100644
--- a/offline_tools_test.py
+++ b/offline_tools_test.py
@@ -158,7 +158,7 @@ class TestOfflineTools(Tester):
keys = 8 * cluster.data_dir_count
node1.stress(['write', 'n={0}K'.format(keys), 'no-warmup',
'-schema', 'replication(factor=1)',
- '-col', 'n=FIXED(10)', 'SIZE=FIXED(1024)',
+ '-col', 'n=FIXED(10)', 'SIZE=FIXED(1200)',
'-rate', 'threads=8'])
node1.flush()
-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Merge branch 'cassandra-3.11' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6eb2758e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6eb2758e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6eb2758e Branch: refs/heads/trunk Commit: 6eb2758e4038564b084f000ac411061d3b942d1f Parents: 855dd0e eb717f1 Author: Ariel Weisberg Authored: Mon Jul 17 13:51:57 2017 -0700 Committer: Ariel Weisberg Committed: Mon Jul 17 13:51:57 2017 -0700 -- CHANGES.txt | 1 + .../AbstractCommitLogSegmentManager.java| 11 +-- .../cassandra/utils/concurrent/WaitQueue.java | 20 3 files changed, 26 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6eb2758e/CHANGES.txt -- diff --cc CHANGES.txt index 0be0e39,e7a10f5..3fb2716 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,102 -1,5 +1,103 @@@ +4.0 + * Don't add localhost to the graph when calculating where to stream from (CASSANDRA-13583) + * Allow skipping equality-restricted clustering columns in ORDER BY clause (CASSANDRA-10271) + * Use common nowInSec for validation compactions (CASSANDRA-13671) + * Improve handling of IR prepare failures (CASSANDRA-13672) + * Send IR coordinator messages synchronously (CASSANDRA-13673) + * Flush system.repair table before IR finalize promise (CASSANDRA-13660) + * Fix column filter creation for wildcard queries (CASSANDRA-13650) + * Add 'nodetool getbatchlogreplaythrottle' and 'nodetool setbatchlogreplaythrottle' (CASSANDRA-13614) + * fix race condition in PendingRepairManager (CASSANDRA-13659) + * Allow noop incremental repair state transitions (CASSANDRA-13658) + * Run repair with down replicas (CASSANDRA-10446) + * Added started & completed repair metrics (CASSANDRA-13598) + * Added started & completed repair metrics (CASSANDRA-13598) + * Improve secondary index (re)build failure and concurrency handling (CASSANDRA-10130) + * Improve calculation of available disk space for compaction (CASSANDRA-13068) + * Change the accessibility of RowCacheSerializer for third party row cache plugins (CASSANDRA-13579) + * Allow sub-range repairs for a preview of repaired data (CASSANDRA-13570) + * NPE in IR cleanup when columnfamily has no sstables (CASSANDRA-13585) + * Fix Randomness of stress values (CASSANDRA-12744) + * Allow selecting Map values and Set elements (CASSANDRA-7396) + * Fast and garbage-free Streaming Histogram (CASSANDRA-13444) + * Update repairTime for keyspaces on completion (CASSANDRA-13539) + * Add configurable upper bound for validation executor threads (CASSANDRA-13521) + * Bring back maxHintTTL propery (CASSANDRA-12982) + * Add testing guidelines (CASSANDRA-13497) + * Add more repair metrics (CASSANDRA-13531) + * RangeStreamer should be smarter when picking endpoints for streaming (CASSANDRA-4650) + * Avoid rewrapping an exception thrown for cache load functions (CASSANDRA-13367) + * Log time elapsed for each incremental repair phase (CASSANDRA-13498) + * Add multiple table operation support to cassandra-stress (CASSANDRA-8780) + * Fix incorrect cqlsh results when selecting same columns multiple times (CASSANDRA-13262) + * Fix WriteResponseHandlerTest is sensitive to test execution order (CASSANDRA-13421) + * Improve incremental repair logging (CASSANDRA-13468) + * Start compaction when incremental repair finishes (CASSANDRA-13454) + * Add repair streaming preview (CASSANDRA-13257) + * Cleanup isIncremental/repairedAt usage (CASSANDRA-13430) + * Change protocol to allow sending key space independent of query string (CASSANDRA-10145) + * Make gc_log and gc_warn settable at runtime (CASSANDRA-12661) + * Take number of files in L0 in account when estimating remaining compaction tasks (CASSANDRA-13354) + * Skip building views during base table streams on range movements (CASSANDRA-13065) + * Improve error messages for +/- operations on maps and tuples (CASSANDRA-13197) + * Remove deprecated repair JMX APIs (CASSANDRA-11530) + * Fix version check to enable streaming keep-alive (CASSANDRA-12929) + * Make it possible to monitor an ideal consistency level separate from actual consistency level (CASSANDRA-13289) + * Outbound TCP connections ignore internode authenticator (CASSANDRA-13324) + * Upgrade junit from 4.6 to 4.12 (CASSANDRA-13360) + * Cleanup ParentRepairSession after repairs (CASSANDRA-13359) + * Upgrade snappy-java to 1.1.2.6 (CASSANDRA-13336) + * Incremental repair not streaming correct sstables (CASSANDRA-13328) + * Upgrade the jna version to 4.3.0 (CASSANDRA-13300) + * Add the currentTimestamp, currentDate, currentTime and currentTimeUUID
[1/3] cassandra git commit: Deadlock in AbstractCommitLogSegmentManager
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 6d0e95af7 -> eb717f154
refs/heads/trunk 855dd0eee -> 6eb2758e4
Deadlock in AbstractCommitLogSegmentManager
Patch by Fedor Bobin; Reviewed by Ariel Weisberg for CASSANDRA-13652
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eb717f15
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb717f15
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb717f15
Branch: refs/heads/cassandra-3.11
Commit: eb717f154bd24453273d7175006fdef75e5724c2
Parents: 6d0e95a
Author: Fedor Bobin
Authored: Tue Jul 11 15:10:28 2017 -0400
Committer: Ariel Weisberg
Committed: Mon Jul 17 13:50:09 2017 -0700
--
CHANGES.txt | 1 +
.../AbstractCommitLogSegmentManager.java| 11 +--
.../cassandra/utils/concurrent/WaitQueue.java | 20
3 files changed, 26 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb717f15/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 8abf1f4..e7a10f5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.11.1
+ * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
* Duplicate the buffer before passing it to analyser in SASI operation
(CASSANDRA-13512)
* Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
Merged from 3.0:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb717f15/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
--
diff --git
a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
old mode 100644
new mode 100755
index 0ab941b..7f3c9f8
---
a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
+++
b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.locks.LockSupport;
+import java.util.function.BooleanSupplier;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.util.concurrent.*;
@@ -82,6 +82,8 @@ public abstract class AbstractCommitLogSegmentManager
private Thread managerThread;
protected final CommitLog commitLog;
private volatile boolean shutdown;
+private final BooleanSupplier managerThreadWaitCondition = () ->
(availableSegment == null && !atSegmentBufferLimit()) || shutdown;
+private final WaitQueue managerThreadWaitQueue = new WaitQueue();
private static final SimpleCachedBufferPool bufferPool =
new
SimpleCachedBufferPool(DatabaseDescriptor.getCommitLogMaxCompressionBuffersInPool(),
DatabaseDescriptor.getCommitLogSegmentSize());
@@ -124,8 +126,6 @@ public abstract class AbstractCommitLogSegmentManager
// Writing threads are not waiting for new segments,
we can spend time on other tasks.
// flush old Cfs if we're full
maybeFlushToReclaim();
-
-LockSupport.park();
}
catch (Throwable t)
{
@@ -140,8 +140,7 @@ public abstract class AbstractCommitLogSegmentManager
// shutting down-- nothing more can or needs to be
done in that case.
}
-while (availableSegment != null || atSegmentBufferLimit()
&& !shutdown)
-LockSupport.park();
+WaitQueue.waitOnCondition(managerThreadWaitCondition,
managerThreadWaitQueue);
}
}
};
@@ -530,7 +529,7 @@ public abstract class AbstractCommitLogSegmentManager
void wakeManager()
{
-LockSupport.unpark(managerThread);
+managerThreadWaitQueue.signalAll();
}
/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb717f15/src/java/org/apache/cassandra/utils/concurrent/WaitQueue.java
--
diff --git a/src/java/org/apache/cassandra/utils/concurrent/WaitQueue.java
b/src/java/org/apache/cassandra/utils/concurrent/WaitQueue.java
index be271b6..5b453b0 100644
--- a/src/java/org/apache/cassandra/utils/concurrent/WaitQueue.java
+++ b/src/java/org/apache/cassandra/utils/concurrent/WaitQueue.java
@@ -22,6 +22,7 @@ import java.util.Iterator;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.
[2/3] cassandra git commit: Deadlock in AbstractCommitLogSegmentManager
Deadlock in AbstractCommitLogSegmentManager
Patch by Fedor Bobin; Reviewed by Ariel Weisberg for CASSANDRA-13652
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eb717f15
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb717f15
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb717f15
Branch: refs/heads/trunk
Commit: eb717f154bd24453273d7175006fdef75e5724c2
Parents: 6d0e95a
Author: Fedor Bobin
Authored: Tue Jul 11 15:10:28 2017 -0400
Committer: Ariel Weisberg
Committed: Mon Jul 17 13:50:09 2017 -0700
--
CHANGES.txt | 1 +
.../AbstractCommitLogSegmentManager.java| 11 +--
.../cassandra/utils/concurrent/WaitQueue.java | 20
3 files changed, 26 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb717f15/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 8abf1f4..e7a10f5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.11.1
+ * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
* Duplicate the buffer before passing it to analyser in SASI operation
(CASSANDRA-13512)
* Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
Merged from 3.0:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb717f15/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
--
diff --git
a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
old mode 100644
new mode 100755
index 0ab941b..7f3c9f8
---
a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
+++
b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.locks.LockSupport;
+import java.util.function.BooleanSupplier;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.util.concurrent.*;
@@ -82,6 +82,8 @@ public abstract class AbstractCommitLogSegmentManager
private Thread managerThread;
protected final CommitLog commitLog;
private volatile boolean shutdown;
+private final BooleanSupplier managerThreadWaitCondition = () ->
(availableSegment == null && !atSegmentBufferLimit()) || shutdown;
+private final WaitQueue managerThreadWaitQueue = new WaitQueue();
private static final SimpleCachedBufferPool bufferPool =
new
SimpleCachedBufferPool(DatabaseDescriptor.getCommitLogMaxCompressionBuffersInPool(),
DatabaseDescriptor.getCommitLogSegmentSize());
@@ -124,8 +126,6 @@ public abstract class AbstractCommitLogSegmentManager
// Writing threads are not waiting for new segments,
we can spend time on other tasks.
// flush old Cfs if we're full
maybeFlushToReclaim();
-
-LockSupport.park();
}
catch (Throwable t)
{
@@ -140,8 +140,7 @@ public abstract class AbstractCommitLogSegmentManager
// shutting down-- nothing more can or needs to be
done in that case.
}
-while (availableSegment != null || atSegmentBufferLimit()
&& !shutdown)
-LockSupport.park();
+WaitQueue.waitOnCondition(managerThreadWaitCondition,
managerThreadWaitQueue);
}
}
};
@@ -530,7 +529,7 @@ public abstract class AbstractCommitLogSegmentManager
void wakeManager()
{
-LockSupport.unpark(managerThread);
+managerThreadWaitQueue.signalAll();
}
/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb717f15/src/java/org/apache/cassandra/utils/concurrent/WaitQueue.java
--
diff --git a/src/java/org/apache/cassandra/utils/concurrent/WaitQueue.java
b/src/java/org/apache/cassandra/utils/concurrent/WaitQueue.java
index be271b6..5b453b0 100644
--- a/src/java/org/apache/cassandra/utils/concurrent/WaitQueue.java
+++ b/src/java/org/apache/cassandra/utils/concurrent/WaitQueue.java
@@ -22,6 +22,7 @@ import java.util.Iterator;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.locks.LockSupport;
+import java.util.function.BooleanSupplier;
import com.coda
cassandra git commit: Optimize Paxos prepare and propose stage for local requests
Repository: cassandra
Updated Branches:
refs/heads/trunk 8ef71f3f2 -> 5ea2c6b8e
Optimize Paxos prepare and propose stage for local requests
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5ea2c6b8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ea2c6b8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ea2c6b8
Branch: refs/heads/trunk
Commit: 5ea2c6b8e963a061e41f2dedec7955a21860f54a
Parents: 8ef71f3
Author: jaydeepkumar1984
Authored: Mon Sep 11 22:05:54 2017 -0700
Committer: Ariel Weisberg
Committed: Thu Sep 28 16:50:32 2017 -0400
--
CHANGES.txt | 1 +
.../apache/cassandra/service/StorageProxy.java | 62 +++-
.../service/paxos/PrepareVerbHandler.java | 8 ++-
.../service/paxos/ProposeVerbHandler.java | 8 ++-
.../cassandra/service/PaxosStateTest.java | 24
5 files changed, 96 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ea2c6b8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 081ed72..6d8d67e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
4.0
+ * Optimize Paxos prepare and propose stage for local requests
(CASSANDRA-13862)
* Throttle base partitions during MV repair streaming to prevent OOM
(CASSANDRA-13299)
* Use compaction threshold for STCS in L0 (CASSANDRA-13861)
* Fix problem with min_compress_ratio: 1 and disallow ratio < 1
(CASSANDRA-13703)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ea2c6b8/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java
b/src/java/org/apache/cassandra/service/StorageProxy.java
index df39530..49bb4b6 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -68,7 +68,10 @@ import org.apache.cassandra.net.*;
import org.apache.cassandra.service.paxos.Commit;
import org.apache.cassandra.service.paxos.PaxosState;
import org.apache.cassandra.service.paxos.PrepareCallback;
+import org.apache.cassandra.service.paxos.PrepareResponse;
+import org.apache.cassandra.service.paxos.PrepareVerbHandler;
import org.apache.cassandra.service.paxos.ProposeCallback;
+import org.apache.cassandra.service.paxos.ProposeVerbHandler;
import org.apache.cassandra.net.MessagingService.Verb;
import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.triggers.TriggerExecutor;
@@ -501,7 +504,34 @@ public class StorageProxy implements StorageProxyMBean
PrepareCallback callback = new
PrepareCallback(toPrepare.update.partitionKey(), toPrepare.update.metadata(),
requiredParticipants, consistencyForPaxos, queryStartNanoTime);
MessageOut message = new
MessageOut(MessagingService.Verb.PAXOS_PREPARE, toPrepare,
Commit.serializer);
for (InetAddress target : endpoints)
-MessagingService.instance().sendRR(message, target, callback);
+{
+if (canDoLocalRequest(target))
+{
+
StageManager.getStage(MessagingService.verbStages.get(MessagingService.Verb.PAXOS_PREPARE)).execute(new
Runnable()
+{
+public void run()
+{
+try
+{
+MessageIn message =
MessageIn.create(FBUtilities.getBroadcastAddress(),
+PrepareVerbHandler.doPrepare(toPrepare),
+Collections.emptyMap(),
+MessagingService.Verb.INTERNAL_RESPONSE,
+MessagingService.current_version);
+callback.response(message);
+}
+catch (Exception ex)
+{
+logger.error("Failed paxos prepare locally : {}",
ex);
+}
+}
+});
+}
+else
+{
+MessagingService.instance().sendRR(message, target, callback);
+}
+}
callback.await();
return callback;
}
@@ -512,8 +542,34 @@ public class StorageProxy implements StorageProxyMBean
ProposeCallback callback = new ProposeCallback(endpoints.size(),
requiredParticipants, !timeoutIfPartial, consistencyLevel, queryStartNanoTime);
MessageOut message = new
MessageOut(MessagingService.Verb.PAXOS_PROPOSE, proposal,
Commit.serializer);
for (InetAddress target : endpoints)
-
[01/10] cassandra git commit: Coalescing strategies improvements CASSANDRA-13090
Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 7e05f393f -> 5725e2c42 refs/heads/cassandra-3.0 3a570d744 -> 3d01e9061 refs/heads/cassandra-3.11 01b91cce2 -> 702ec088f refs/heads/trunk ffc82b1ee -> edcbef3e3 Coalescing strategies improvements CASSANDRA-13090 With the previous code TIMEHORIZON and MOVINGAVERAGE coalesing strategy would wait even when the backlog still contains data which would make it grow even more. Also: - cleanups parkLoop() - add otc_coalescing_max_coalesced_messages - add otc_coalescing_enough_coalesced_messages - add other otc_* settings to cassandra.yaml patch by Corentin Chary reviewed by Ariel Weisberg for CASSANDRA-13090 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5725e2c4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5725e2c4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5725e2c4 Branch: refs/heads/cassandra-2.2 Commit: 5725e2c422d21d8efe5ae3bc4389842939553650 Parents: 7e05f39 Author: Corentin Chary Authored: Mon Jan 9 12:06:56 2017 -0500 Committer: Ariel Weisberg Committed: Mon Feb 13 12:58:29 2017 -0500 -- CHANGES.txt | 1 + conf/cassandra.yaml | 32 .../org/apache/cassandra/config/Config.java | 3 +- .../cassandra/config/DatabaseDescriptor.java| 16 .../cassandra/net/OutboundTcpConnection.java| 4 +- .../cassandra/utils/CoalescingStrategies.java | 32 .../utils/CoalescingStrategiesTest.java | 40 7 files changed, 119 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5725e2c4/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 214fe97..4052b0f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2.9 + * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090) * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) * Fix speculative retry bugs (CASSANDRA-13009) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5725e2c4/conf/cassandra.yaml -- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index ab2aa14..ddb7927 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -884,3 +884,35 @@ enable_user_defined_functions: false # below their system default. The sysinternals 'clockres' tool can confirm your system's default # setting. windows_timer_interval: 1 + +# Maximum size of any value in SSTables. Safety measure to detect SSTable corruption +# early. Any value size larger than this threshold will result into marking an SSTable +# as corrupted. +# max_value_size_in_mb: 256 + +# Coalescing Strategies # +# Coalescing multiples messages turns out to significantly boost message processing throughput (think doubling or more). +# On bare metal, the floor for packet processing throughput is high enough that many applications won’t notice, but in +# virtualized environments, the point at which an application can be bound by network packet processing can be +# surprisingly low compared to the throughput of task processing that is possible inside a VM. It’s not that bare metal +# doesn’t benefit from coalescing messages, it’s that the number of packets a bare metal network interface can process +# is sufficient for many applications such that no load starvation is experienced even without coalescing. +# There are other benefits to coalescing network messages that are harder to isolate with a simple metric like messages +# per second. By coalescing multiple tasks together, a network thread can process multiple messages for the cost of one +# trip to read from a socket, and all the task submission work can be done at the same time reducing context switching +# and increasing cache friendliness of network message processing. +# See CASSANDRA-8692 for details. + +# Strategy to use for coalescing messages in OutboundTcpConnection. +# Can be fixed, movingaverage, timehorizon (default), disabled. +# You can also specify a subclass of CoalescingStrategies.CoalescingStrategy by name. +# otc_coalescing_strategy: TIMEHORIZON + +# How many microseconds to wait for coalescing. For fixed strategy this is the amount of time after the first +# message is received before it will be sent with any accompanying messages. For moving average this is the +# maximum amount of time that will be waited as well as the interval at which messages must arrive on average +# for coalescing to be enabled. +# otc_coalescing_window_us: 200 + +# Do n
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
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/3d01e906 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d01e906 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d01e906 Branch: refs/heads/cassandra-3.0 Commit: 3d01e906152f02f826a9663afb4a1232060ad584 Parents: 3a570d7 5725e2c Author: Ariel Weisberg Authored: Mon Feb 13 13:00:20 2017 -0500 Committer: Ariel Weisberg Committed: Mon Feb 13 13:23:39 2017 -0500 -- CHANGES.txt | 1 + conf/cassandra.yaml | 27 + .../org/apache/cassandra/config/Config.java | 3 +- .../cassandra/config/DatabaseDescriptor.java| 16 .../cassandra/net/OutboundTcpConnection.java| 4 +- .../cassandra/utils/CoalescingStrategies.java | 32 .../utils/CoalescingStrategiesTest.java | 40 7 files changed, 114 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d01e906/CHANGES.txt -- diff --cc CHANGES.txt index ac3d1ed,4052b0f..b19550a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,43 -1,5 +1,44 @@@ -2.2.9 +3.0.11 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008) + * Hint related logging should include the IP address of the destination in addition to + host ID (CASSANDRA-13205) + * Reloading logback.xml does not work (CASSANDRA-13173) + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109) + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125) + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152) + * Abort or retry on failed hints delivery (CASSANDRA-13124) + * Fix handling of partition with partition-level deletion plus + live rows in sstabledump (CASSANDRA-13177) + * Provide user workaround when system_schema.columns does not contain entries + for a table that's in system_schema.tables (CASSANDRA-13180) + * Dump threads when unit tests time out (CASSANDRA-13117) + * Better error when modifying function permissions without explicit keyspace (CASSANDRA-12925) + * Indexer is not correctly invoked when building indexes over sstables (CASSANDRA-13075) + * Read repair is not blocking repair to finish in foreground repair (CASSANDRA-13115) + * Stress daemon help is incorrect (CASSANDRA-12563) + * Remove ALTER TYPE support (CASSANDRA-12443) + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203) + * Set javac encoding to utf-8 (CASSANDRA-11077) + * Replace empty strings with null values if they cannot be converted (CASSANDRA-12794) + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620) + * Add parent repair session id to anticompaction log message (CASSANDRA-12186) + * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905) + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829) + * Mark MVs as built after successful bootstrap (CASSANDRA-12984) + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040) + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021) + * Thread local pools never cleaned up (CASSANDRA-13033) + * Set RPC_READY to false when draining or if a node is marked as shutdown (CASSANDRA-12781) + * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956) + * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868) + * Nodetool should use a more sane max heap size (CASSANDRA-12739) + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651) + * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934) + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535) + * Reenable HeapPool (CASSANDRA-12900) +Merged from 2.2: + * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090) * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) * Fix speculative retry bugs (CASSANDRA-13009) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d01e906/conf/cassandra.yaml -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d01e906/src/java/org/apache/cassandra/config/Config.java -- http://git-wip-us.apache
[03/10] cassandra git commit: Coalescing strategies improvements CASSANDRA-13090
Coalescing strategies improvements CASSANDRA-13090 With the previous code TIMEHORIZON and MOVINGAVERAGE coalesing strategy would wait even when the backlog still contains data which would make it grow even more. Also: - cleanups parkLoop() - add otc_coalescing_max_coalesced_messages - add otc_coalescing_enough_coalesced_messages - add other otc_* settings to cassandra.yaml patch by Corentin Chary reviewed by Ariel Weisberg for CASSANDRA-13090 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5725e2c4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5725e2c4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5725e2c4 Branch: refs/heads/cassandra-3.11 Commit: 5725e2c422d21d8efe5ae3bc4389842939553650 Parents: 7e05f39 Author: Corentin Chary Authored: Mon Jan 9 12:06:56 2017 -0500 Committer: Ariel Weisberg Committed: Mon Feb 13 12:58:29 2017 -0500 -- CHANGES.txt | 1 + conf/cassandra.yaml | 32 .../org/apache/cassandra/config/Config.java | 3 +- .../cassandra/config/DatabaseDescriptor.java| 16 .../cassandra/net/OutboundTcpConnection.java| 4 +- .../cassandra/utils/CoalescingStrategies.java | 32 .../utils/CoalescingStrategiesTest.java | 40 7 files changed, 119 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5725e2c4/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 214fe97..4052b0f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2.9 + * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090) * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) * Fix speculative retry bugs (CASSANDRA-13009) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5725e2c4/conf/cassandra.yaml -- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index ab2aa14..ddb7927 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -884,3 +884,35 @@ enable_user_defined_functions: false # below their system default. The sysinternals 'clockres' tool can confirm your system's default # setting. windows_timer_interval: 1 + +# Maximum size of any value in SSTables. Safety measure to detect SSTable corruption +# early. Any value size larger than this threshold will result into marking an SSTable +# as corrupted. +# max_value_size_in_mb: 256 + +# Coalescing Strategies # +# Coalescing multiples messages turns out to significantly boost message processing throughput (think doubling or more). +# On bare metal, the floor for packet processing throughput is high enough that many applications won’t notice, but in +# virtualized environments, the point at which an application can be bound by network packet processing can be +# surprisingly low compared to the throughput of task processing that is possible inside a VM. It’s not that bare metal +# doesn’t benefit from coalescing messages, it’s that the number of packets a bare metal network interface can process +# is sufficient for many applications such that no load starvation is experienced even without coalescing. +# There are other benefits to coalescing network messages that are harder to isolate with a simple metric like messages +# per second. By coalescing multiple tasks together, a network thread can process multiple messages for the cost of one +# trip to read from a socket, and all the task submission work can be done at the same time reducing context switching +# and increasing cache friendliness of network message processing. +# See CASSANDRA-8692 for details. + +# Strategy to use for coalescing messages in OutboundTcpConnection. +# Can be fixed, movingaverage, timehorizon (default), disabled. +# You can also specify a subclass of CoalescingStrategies.CoalescingStrategy by name. +# otc_coalescing_strategy: TIMEHORIZON + +# How many microseconds to wait for coalescing. For fixed strategy this is the amount of time after the first +# message is received before it will be sent with any accompanying messages. For moving average this is the +# maximum amount of time that will be waited as well as the interval at which messages must arrive on average +# for coalescing to be enabled. +# otc_coalescing_window_us: 200 + +# Do not try to coalesce messages if we already got that many messages. This should be more than 2 and less than 128. +# otc_coalescing_enough_coalesced_messages: 8 http://git-wip-us.apache.org/repos/asf/cassandra/blob/5725e2c4/src/java/o
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
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/3d01e906 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d01e906 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d01e906 Branch: refs/heads/trunk Commit: 3d01e906152f02f826a9663afb4a1232060ad584 Parents: 3a570d7 5725e2c Author: Ariel Weisberg Authored: Mon Feb 13 13:00:20 2017 -0500 Committer: Ariel Weisberg Committed: Mon Feb 13 13:23:39 2017 -0500 -- CHANGES.txt | 1 + conf/cassandra.yaml | 27 + .../org/apache/cassandra/config/Config.java | 3 +- .../cassandra/config/DatabaseDescriptor.java| 16 .../cassandra/net/OutboundTcpConnection.java| 4 +- .../cassandra/utils/CoalescingStrategies.java | 32 .../utils/CoalescingStrategiesTest.java | 40 7 files changed, 114 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d01e906/CHANGES.txt -- diff --cc CHANGES.txt index ac3d1ed,4052b0f..b19550a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,43 -1,5 +1,44 @@@ -2.2.9 +3.0.11 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008) + * Hint related logging should include the IP address of the destination in addition to + host ID (CASSANDRA-13205) + * Reloading logback.xml does not work (CASSANDRA-13173) + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109) + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125) + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152) + * Abort or retry on failed hints delivery (CASSANDRA-13124) + * Fix handling of partition with partition-level deletion plus + live rows in sstabledump (CASSANDRA-13177) + * Provide user workaround when system_schema.columns does not contain entries + for a table that's in system_schema.tables (CASSANDRA-13180) + * Dump threads when unit tests time out (CASSANDRA-13117) + * Better error when modifying function permissions without explicit keyspace (CASSANDRA-12925) + * Indexer is not correctly invoked when building indexes over sstables (CASSANDRA-13075) + * Read repair is not blocking repair to finish in foreground repair (CASSANDRA-13115) + * Stress daemon help is incorrect (CASSANDRA-12563) + * Remove ALTER TYPE support (CASSANDRA-12443) + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203) + * Set javac encoding to utf-8 (CASSANDRA-11077) + * Replace empty strings with null values if they cannot be converted (CASSANDRA-12794) + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620) + * Add parent repair session id to anticompaction log message (CASSANDRA-12186) + * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905) + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829) + * Mark MVs as built after successful bootstrap (CASSANDRA-12984) + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040) + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021) + * Thread local pools never cleaned up (CASSANDRA-13033) + * Set RPC_READY to false when draining or if a node is marked as shutdown (CASSANDRA-12781) + * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956) + * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868) + * Nodetool should use a more sane max heap size (CASSANDRA-12739) + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651) + * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934) + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535) + * Reenable HeapPool (CASSANDRA-12900) +Merged from 2.2: + * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090) * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) * Fix speculative retry bugs (CASSANDRA-13009) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d01e906/conf/cassandra.yaml -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d01e906/src/java/org/apache/cassandra/config/Config.java -- http://git-wip-us.apache.org/rep
[04/10] cassandra git commit: Coalescing strategies improvements CASSANDRA-13090
Coalescing strategies improvements CASSANDRA-13090 With the previous code TIMEHORIZON and MOVINGAVERAGE coalesing strategy would wait even when the backlog still contains data which would make it grow even more. Also: - cleanups parkLoop() - add otc_coalescing_max_coalesced_messages - add otc_coalescing_enough_coalesced_messages - add other otc_* settings to cassandra.yaml patch by Corentin Chary reviewed by Ariel Weisberg for CASSANDRA-13090 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5725e2c4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5725e2c4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5725e2c4 Branch: refs/heads/trunk Commit: 5725e2c422d21d8efe5ae3bc4389842939553650 Parents: 7e05f39 Author: Corentin Chary Authored: Mon Jan 9 12:06:56 2017 -0500 Committer: Ariel Weisberg Committed: Mon Feb 13 12:58:29 2017 -0500 -- CHANGES.txt | 1 + conf/cassandra.yaml | 32 .../org/apache/cassandra/config/Config.java | 3 +- .../cassandra/config/DatabaseDescriptor.java| 16 .../cassandra/net/OutboundTcpConnection.java| 4 +- .../cassandra/utils/CoalescingStrategies.java | 32 .../utils/CoalescingStrategiesTest.java | 40 7 files changed, 119 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5725e2c4/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 214fe97..4052b0f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2.9 + * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090) * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) * Fix speculative retry bugs (CASSANDRA-13009) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5725e2c4/conf/cassandra.yaml -- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index ab2aa14..ddb7927 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -884,3 +884,35 @@ enable_user_defined_functions: false # below their system default. The sysinternals 'clockres' tool can confirm your system's default # setting. windows_timer_interval: 1 + +# Maximum size of any value in SSTables. Safety measure to detect SSTable corruption +# early. Any value size larger than this threshold will result into marking an SSTable +# as corrupted. +# max_value_size_in_mb: 256 + +# Coalescing Strategies # +# Coalescing multiples messages turns out to significantly boost message processing throughput (think doubling or more). +# On bare metal, the floor for packet processing throughput is high enough that many applications won’t notice, but in +# virtualized environments, the point at which an application can be bound by network packet processing can be +# surprisingly low compared to the throughput of task processing that is possible inside a VM. It’s not that bare metal +# doesn’t benefit from coalescing messages, it’s that the number of packets a bare metal network interface can process +# is sufficient for many applications such that no load starvation is experienced even without coalescing. +# There are other benefits to coalescing network messages that are harder to isolate with a simple metric like messages +# per second. By coalescing multiple tasks together, a network thread can process multiple messages for the cost of one +# trip to read from a socket, and all the task submission work can be done at the same time reducing context switching +# and increasing cache friendliness of network message processing. +# See CASSANDRA-8692 for details. + +# Strategy to use for coalescing messages in OutboundTcpConnection. +# Can be fixed, movingaverage, timehorizon (default), disabled. +# You can also specify a subclass of CoalescingStrategies.CoalescingStrategy by name. +# otc_coalescing_strategy: TIMEHORIZON + +# How many microseconds to wait for coalescing. For fixed strategy this is the amount of time after the first +# message is received before it will be sent with any accompanying messages. For moving average this is the +# maximum amount of time that will be waited as well as the interval at which messages must arrive on average +# for coalescing to be enabled. +# otc_coalescing_window_us: 200 + +# Do not try to coalesce messages if we already got that many messages. This should be more than 2 and less than 128. +# otc_coalescing_enough_coalesced_messages: 8 http://git-wip-us.apache.org/repos/asf/cassandra/blob/5725e2c4/src/java/org/apache
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/702ec088 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/702ec088 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/702ec088 Branch: refs/heads/cassandra-3.11 Commit: 702ec088f5f61106b41e128f3fb8f109da8cbe1c Parents: 01b91cc 3d01e90 Author: Ariel Weisberg Authored: Mon Feb 13 13:31:23 2017 -0500 Committer: Ariel Weisberg Committed: Mon Feb 13 13:32:30 2017 -0500 -- CHANGES.txt | 1 + conf/cassandra.yaml | 27 + .../org/apache/cassandra/config/Config.java | 3 +- .../cassandra/config/DatabaseDescriptor.java| 16 .../cassandra/net/OutboundTcpConnection.java| 4 +- .../cassandra/utils/CoalescingStrategies.java | 32 .../utils/CoalescingStrategiesTest.java | 40 7 files changed, 114 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/702ec088/CHANGES.txt -- diff --cc CHANGES.txt index 67c45e8,b19550a..8164a52 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -215,20 -100,6 +215,21 @@@ Merged from 3.0 * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776) * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545) Merged from 2.2: ++ * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090) + * Fix speculative retry bugs (CASSANDRA-13009) + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) + * Fix race causing infinite loop if Thrift server is stopped before it starts listening (CASSANDRA-12856) + * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979) + * Remove support for non-JavaScript UDFs (CASSANDRA-12883) + * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074) + * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909) + * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616) + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796) + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980) + * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935) + * cqlsh: fix DESC TYPES errors (CASSANDRA-12914) + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899) + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281) * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792) * Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901) * cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863) http://git-wip-us.apache.org/repos/asf/cassandra/blob/702ec088/conf/cassandra.yaml -- diff --cc conf/cassandra.yaml index 4436a02,a9d4c01..063a0b7 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@@ -1173,24 -959,29 +1173,51 @@@ gc_warn_threshold_in_ms: 100 # as corrupted. # max_value_size_in_mb: 256 +# Back-pressure settings # +# If enabled, the coordinator will apply the back-pressure strategy specified below to each mutation +# sent to replicas, with the aim of reducing pressure on overloaded replicas. +back_pressure_enabled: false +# The back-pressure strategy applied. +# The default implementation, RateBasedBackPressure, takes three arguments: +# high ratio, factor, and flow type, and uses the ratio between incoming mutation responses and outgoing mutation requests. +# If below high ratio, outgoing mutations are rate limited according to the incoming rate decreased by the given factor; +# if above high ratio, the rate limiting is increased by the given factor; +# such factor is usually best configured between 1 and 10, use larger values for a faster recovery +# at the expense of potentially more dropped mutations; +# the rate limiting is applied according to the flow type: if FAST, it's rate limited at the speed of the fastest replica, +# if SLOW at the speed of the slowest one. +# New strategies can be added. Implementors need to implement org.apache.cassandra.net.BackpressureStrategy and +# provide a public constructor accepting a Map. +back_pressure_strategy: +- class_name: org.apache.cassandra.net.RateBasedBackPressure + parameters: +- high_ratio: 0.90 + factor: 5 + flow:
[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/702ec088 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/702ec088 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/702ec088 Branch: refs/heads/trunk Commit: 702ec088f5f61106b41e128f3fb8f109da8cbe1c Parents: 01b91cc 3d01e90 Author: Ariel Weisberg Authored: Mon Feb 13 13:31:23 2017 -0500 Committer: Ariel Weisberg Committed: Mon Feb 13 13:32:30 2017 -0500 -- CHANGES.txt | 1 + conf/cassandra.yaml | 27 + .../org/apache/cassandra/config/Config.java | 3 +- .../cassandra/config/DatabaseDescriptor.java| 16 .../cassandra/net/OutboundTcpConnection.java| 4 +- .../cassandra/utils/CoalescingStrategies.java | 32 .../utils/CoalescingStrategiesTest.java | 40 7 files changed, 114 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/702ec088/CHANGES.txt -- diff --cc CHANGES.txt index 67c45e8,b19550a..8164a52 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -215,20 -100,6 +215,21 @@@ Merged from 3.0 * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776) * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545) Merged from 2.2: ++ * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090) + * Fix speculative retry bugs (CASSANDRA-13009) + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) + * Fix race causing infinite loop if Thrift server is stopped before it starts listening (CASSANDRA-12856) + * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979) + * Remove support for non-JavaScript UDFs (CASSANDRA-12883) + * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074) + * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909) + * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616) + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796) + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980) + * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935) + * cqlsh: fix DESC TYPES errors (CASSANDRA-12914) + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899) + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281) * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792) * Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901) * cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863) http://git-wip-us.apache.org/repos/asf/cassandra/blob/702ec088/conf/cassandra.yaml -- diff --cc conf/cassandra.yaml index 4436a02,a9d4c01..063a0b7 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@@ -1173,24 -959,29 +1173,51 @@@ gc_warn_threshold_in_ms: 100 # as corrupted. # max_value_size_in_mb: 256 +# Back-pressure settings # +# If enabled, the coordinator will apply the back-pressure strategy specified below to each mutation +# sent to replicas, with the aim of reducing pressure on overloaded replicas. +back_pressure_enabled: false +# The back-pressure strategy applied. +# The default implementation, RateBasedBackPressure, takes three arguments: +# high ratio, factor, and flow type, and uses the ratio between incoming mutation responses and outgoing mutation requests. +# If below high ratio, outgoing mutations are rate limited according to the incoming rate decreased by the given factor; +# if above high ratio, the rate limiting is increased by the given factor; +# such factor is usually best configured between 1 and 10, use larger values for a faster recovery +# at the expense of potentially more dropped mutations; +# the rate limiting is applied according to the flow type: if FAST, it's rate limited at the speed of the fastest replica, +# if SLOW at the speed of the slowest one. +# New strategies can be added. Implementors need to implement org.apache.cassandra.net.BackpressureStrategy and +# provide a public constructor accepting a Map. +back_pressure_strategy: +- class_name: org.apache.cassandra.net.RateBasedBackPressure + parameters: +- high_ratio: 0.90 + factor: 5 + flow: FAST ++
[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/edcbef3e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/edcbef3e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/edcbef3e
Branch: refs/heads/trunk
Commit: edcbef3e343778b4d5affe019f64c89da2a13aa2
Parents: ffc82b1 702ec08
Author: Ariel Weisberg
Authored: Mon Feb 13 13:33:11 2017 -0500
Committer: Ariel Weisberg
Committed: Mon Feb 13 13:34:31 2017 -0500
--
CHANGES.txt | 1 +
conf/cassandra.yaml | 27 +
.../org/apache/cassandra/config/Config.java | 3 +-
.../cassandra/config/DatabaseDescriptor.java| 16
.../cassandra/net/OutboundTcpConnection.java| 4 +-
.../cassandra/utils/CoalescingStrategies.java | 32
.../utils/CoalescingStrategiesTest.java | 40
7 files changed, 114 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/edcbef3e/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/edcbef3e/conf/cassandra.yaml
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/edcbef3e/src/java/org/apache/cassandra/config/Config.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/edcbef3e/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/edcbef3e/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
--
diff --cc src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index 574e9e7,ea64ef4..69480df
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@@ -82,9 -83,8 +82,11 @@@ public class OutboundTcpConnection exte
private static final String BUFFER_SIZE_PROPERTY = PREFIX +
"otc_buffer_size";
private static final int BUFFER_SIZE =
Integer.getInteger(BUFFER_SIZE_PROPERTY, 1024 * 64);
+//Size of 3 elements added to every message
+private static final int PROTOCOL_MAGIC_ID_TIMESTAMP_SIZE = 12;
+
+ public static final int MAX_COALESCED_MESSAGES = 128;
+
private static CoalescingStrategy newCoalescingStrategy(String
displayName)
{
return
CoalescingStrategies.newCoalescingStrategy(DatabaseDescriptor.getOtcCoalescingStrategy(),
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
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/3d01e906 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d01e906 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d01e906 Branch: refs/heads/cassandra-3.11 Commit: 3d01e906152f02f826a9663afb4a1232060ad584 Parents: 3a570d7 5725e2c Author: Ariel Weisberg Authored: Mon Feb 13 13:00:20 2017 -0500 Committer: Ariel Weisberg Committed: Mon Feb 13 13:23:39 2017 -0500 -- CHANGES.txt | 1 + conf/cassandra.yaml | 27 + .../org/apache/cassandra/config/Config.java | 3 +- .../cassandra/config/DatabaseDescriptor.java| 16 .../cassandra/net/OutboundTcpConnection.java| 4 +- .../cassandra/utils/CoalescingStrategies.java | 32 .../utils/CoalescingStrategiesTest.java | 40 7 files changed, 114 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d01e906/CHANGES.txt -- diff --cc CHANGES.txt index ac3d1ed,4052b0f..b19550a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,43 -1,5 +1,44 @@@ -2.2.9 +3.0.11 + * Add vm.max_map_count StartupCheck (CASSANDRA-13008) + * Hint related logging should include the IP address of the destination in addition to + host ID (CASSANDRA-13205) + * Reloading logback.xml does not work (CASSANDRA-13173) + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109) + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125) + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152) + * Abort or retry on failed hints delivery (CASSANDRA-13124) + * Fix handling of partition with partition-level deletion plus + live rows in sstabledump (CASSANDRA-13177) + * Provide user workaround when system_schema.columns does not contain entries + for a table that's in system_schema.tables (CASSANDRA-13180) + * Dump threads when unit tests time out (CASSANDRA-13117) + * Better error when modifying function permissions without explicit keyspace (CASSANDRA-12925) + * Indexer is not correctly invoked when building indexes over sstables (CASSANDRA-13075) + * Read repair is not blocking repair to finish in foreground repair (CASSANDRA-13115) + * Stress daemon help is incorrect (CASSANDRA-12563) + * Remove ALTER TYPE support (CASSANDRA-12443) + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203) + * Set javac encoding to utf-8 (CASSANDRA-11077) + * Replace empty strings with null values if they cannot be converted (CASSANDRA-12794) + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620) + * Add parent repair session id to anticompaction log message (CASSANDRA-12186) + * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905) + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829) + * Mark MVs as built after successful bootstrap (CASSANDRA-12984) + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040) + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021) + * Thread local pools never cleaned up (CASSANDRA-13033) + * Set RPC_READY to false when draining or if a node is marked as shutdown (CASSANDRA-12781) + * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956) + * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868) + * Nodetool should use a more sane max heap size (CASSANDRA-12739) + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651) + * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934) + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535) + * Reenable HeapPool (CASSANDRA-12900) +Merged from 2.2: + * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090) * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) * Fix speculative retry bugs (CASSANDRA-13009) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d01e906/conf/cassandra.yaml -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d01e906/src/java/org/apache/cassandra/config/Config.java -- http://git-wip-us.apach
[02/10] cassandra git commit: Coalescing strategies improvements CASSANDRA-13090
Coalescing strategies improvements CASSANDRA-13090 With the previous code TIMEHORIZON and MOVINGAVERAGE coalesing strategy would wait even when the backlog still contains data which would make it grow even more. Also: - cleanups parkLoop() - add otc_coalescing_max_coalesced_messages - add otc_coalescing_enough_coalesced_messages - add other otc_* settings to cassandra.yaml patch by Corentin Chary reviewed by Ariel Weisberg for CASSANDRA-13090 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5725e2c4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5725e2c4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5725e2c4 Branch: refs/heads/cassandra-3.0 Commit: 5725e2c422d21d8efe5ae3bc4389842939553650 Parents: 7e05f39 Author: Corentin Chary Authored: Mon Jan 9 12:06:56 2017 -0500 Committer: Ariel Weisberg Committed: Mon Feb 13 12:58:29 2017 -0500 -- CHANGES.txt | 1 + conf/cassandra.yaml | 32 .../org/apache/cassandra/config/Config.java | 3 +- .../cassandra/config/DatabaseDescriptor.java| 16 .../cassandra/net/OutboundTcpConnection.java| 4 +- .../cassandra/utils/CoalescingStrategies.java | 32 .../utils/CoalescingStrategiesTest.java | 40 7 files changed, 119 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5725e2c4/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 214fe97..4052b0f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2.9 + * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090) * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) * Fix speculative retry bugs (CASSANDRA-13009) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5725e2c4/conf/cassandra.yaml -- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index ab2aa14..ddb7927 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -884,3 +884,35 @@ enable_user_defined_functions: false # below their system default. The sysinternals 'clockres' tool can confirm your system's default # setting. windows_timer_interval: 1 + +# Maximum size of any value in SSTables. Safety measure to detect SSTable corruption +# early. Any value size larger than this threshold will result into marking an SSTable +# as corrupted. +# max_value_size_in_mb: 256 + +# Coalescing Strategies # +# Coalescing multiples messages turns out to significantly boost message processing throughput (think doubling or more). +# On bare metal, the floor for packet processing throughput is high enough that many applications won’t notice, but in +# virtualized environments, the point at which an application can be bound by network packet processing can be +# surprisingly low compared to the throughput of task processing that is possible inside a VM. It’s not that bare metal +# doesn’t benefit from coalescing messages, it’s that the number of packets a bare metal network interface can process +# is sufficient for many applications such that no load starvation is experienced even without coalescing. +# There are other benefits to coalescing network messages that are harder to isolate with a simple metric like messages +# per second. By coalescing multiple tasks together, a network thread can process multiple messages for the cost of one +# trip to read from a socket, and all the task submission work can be done at the same time reducing context switching +# and increasing cache friendliness of network message processing. +# See CASSANDRA-8692 for details. + +# Strategy to use for coalescing messages in OutboundTcpConnection. +# Can be fixed, movingaverage, timehorizon (default), disabled. +# You can also specify a subclass of CoalescingStrategies.CoalescingStrategy by name. +# otc_coalescing_strategy: TIMEHORIZON + +# How many microseconds to wait for coalescing. For fixed strategy this is the amount of time after the first +# message is received before it will be sent with any accompanying messages. For moving average this is the +# maximum amount of time that will be waited as well as the interval at which messages must arrive on average +# for coalescing to be enabled. +# otc_coalescing_window_us: 200 + +# Do not try to coalesce messages if we already got that many messages. This should be more than 2 and less than 128. +# otc_coalescing_enough_coalesced_messages: 8 http://git-wip-us.apache.org/repos/asf/cassandra/blob/5725e2c4/src/java/or
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23a1dee4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23a1dee4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23a1dee4 Branch: refs/heads/cassandra-3.11 Commit: 23a1dee45f43ea241deb6b677d8c42cb3e9d45a0 Parents: 702ec08 82943d6 Author: Ariel Weisberg Authored: Tue Feb 14 15:13:39 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 14 15:13:39 2017 -0500 -- conf/cassandra.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/23a1dee4/conf/cassandra.yaml -- diff --cc conf/cassandra.yaml index 063a0b7,790dfd7..90e28b2 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@@ -1173,34 -959,12 +1173,34 @@@ gc_warn_threshold_in_ms: 100 # as corrupted. # max_value_size_in_mb: 256 +# Back-pressure settings # +# If enabled, the coordinator will apply the back-pressure strategy specified below to each mutation +# sent to replicas, with the aim of reducing pressure on overloaded replicas. +back_pressure_enabled: false +# The back-pressure strategy applied. +# The default implementation, RateBasedBackPressure, takes three arguments: +# high ratio, factor, and flow type, and uses the ratio between incoming mutation responses and outgoing mutation requests. +# If below high ratio, outgoing mutations are rate limited according to the incoming rate decreased by the given factor; +# if above high ratio, the rate limiting is increased by the given factor; +# such factor is usually best configured between 1 and 10, use larger values for a faster recovery +# at the expense of potentially more dropped mutations; +# the rate limiting is applied according to the flow type: if FAST, it's rate limited at the speed of the fastest replica, +# if SLOW at the speed of the slowest one. +# New strategies can be added. Implementors need to implement org.apache.cassandra.net.BackpressureStrategy and +# provide a public constructor accepting a Map. +back_pressure_strategy: +- class_name: org.apache.cassandra.net.RateBasedBackPressure + parameters: +- high_ratio: 0.90 + factor: 5 + flow: FAST + # Coalescing Strategies # # Coalescing multiples messages turns out to significantly boost message processing throughput (think doubling or more). - # On bare metal, the floor for packet processing throughput is high enough that many applications won’t notice, but in + # On bare metal, the floor for packet processing throughput is high enough that many applications won't notice, but in # virtualized environments, the point at which an application can be bound by network packet processing can be - # surprisingly low compared to the throughput of task processing that is possible inside a VM. It’s not that bare metal - # doesn’t benefit from coalescing messages, it’s that the number of packets a bare metal network interface can process + # surprisingly low compared to the throughput of task processing that is possible inside a VM. It's not that bare metal + # doesn't benefit from coalescing messages, it's that the number of packets a bare metal network interface can process # is sufficient for many applications such that no load starvation is experienced even without coalescing. # There are other benefits to coalescing network messages that are harder to isolate with a simple metric like messages # per second. By coalescing multiple tasks together, a network thread can process multiple messages for the cost of one
[01/10] cassandra git commit: Remove non-ascii characters from cassandra.yaml introduced by CASSANDRA-13090
Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 5725e2c42 -> 9a80f803c refs/heads/cassandra-3.0 3d01e9061 -> 82943d6aa refs/heads/cassandra-3.11 702ec088f -> 23a1dee45 refs/heads/trunk 3f3db2d40 -> 48bfc8e8d Remove non-ascii characters from cassandra.yaml introduced by CASSANDRA-13090 patch by Ariel Weisberg; reviewed by Jason Brown for CASSANDRA-13219 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a80f803 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a80f803 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a80f803 Branch: refs/heads/cassandra-2.2 Commit: 9a80f803c2ec9a4a74cb8a99293dc81ef3dc183d Parents: 5725e2c Author: Ariel Weisberg Authored: Tue Feb 14 15:09:20 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 14 15:09:20 2017 -0500 -- conf/cassandra.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a80f803/conf/cassandra.yaml -- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index ddb7927..41c1fb1 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -892,10 +892,10 @@ windows_timer_interval: 1 # Coalescing Strategies # # Coalescing multiples messages turns out to significantly boost message processing throughput (think doubling or more). -# On bare metal, the floor for packet processing throughput is high enough that many applications won’t notice, but in +# On bare metal, the floor for packet processing throughput is high enough that many applications won't notice, but in # virtualized environments, the point at which an application can be bound by network packet processing can be -# surprisingly low compared to the throughput of task processing that is possible inside a VM. It’s not that bare metal -# doesn’t benefit from coalescing messages, it’s that the number of packets a bare metal network interface can process +# surprisingly low compared to the throughput of task processing that is possible inside a VM. It's not that bare metal +# doesn't benefit from coalescing messages, it's that the number of packets a bare metal network interface can process # is sufficient for many applications such that no load starvation is experienced even without coalescing. # There are other benefits to coalescing network messages that are harder to isolate with a simple metric like messages # per second. By coalescing multiple tasks together, a network thread can process multiple messages for the cost of one
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
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/82943d6a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82943d6a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82943d6a Branch: refs/heads/cassandra-3.11 Commit: 82943d6aa7564222f43e6c6f9e6d599ebd9dbbe2 Parents: 3d01e90 9a80f80 Author: Ariel Weisberg Authored: Tue Feb 14 15:12:39 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 14 15:12:39 2017 -0500 -- conf/cassandra.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/82943d6a/conf/cassandra.yaml --
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
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/82943d6a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82943d6a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82943d6a Branch: refs/heads/trunk Commit: 82943d6aa7564222f43e6c6f9e6d599ebd9dbbe2 Parents: 3d01e90 9a80f80 Author: Ariel Weisberg Authored: Tue Feb 14 15:12:39 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 14 15:12:39 2017 -0500 -- conf/cassandra.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/82943d6a/conf/cassandra.yaml --
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
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/82943d6a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82943d6a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82943d6a Branch: refs/heads/cassandra-3.0 Commit: 82943d6aa7564222f43e6c6f9e6d599ebd9dbbe2 Parents: 3d01e90 9a80f80 Author: Ariel Weisberg Authored: Tue Feb 14 15:12:39 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 14 15:12:39 2017 -0500 -- conf/cassandra.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/82943d6a/conf/cassandra.yaml --
[04/10] cassandra git commit: Remove non-ascii characters from cassandra.yaml introduced by CASSANDRA-13090
Remove non-ascii characters from cassandra.yaml introduced by CASSANDRA-13090 patch by Ariel Weisberg; reviewed by Jason Brown for CASSANDRA-13219 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a80f803 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a80f803 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a80f803 Branch: refs/heads/trunk Commit: 9a80f803c2ec9a4a74cb8a99293dc81ef3dc183d Parents: 5725e2c Author: Ariel Weisberg Authored: Tue Feb 14 15:09:20 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 14 15:09:20 2017 -0500 -- conf/cassandra.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a80f803/conf/cassandra.yaml -- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index ddb7927..41c1fb1 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -892,10 +892,10 @@ windows_timer_interval: 1 # Coalescing Strategies # # Coalescing multiples messages turns out to significantly boost message processing throughput (think doubling or more). -# On bare metal, the floor for packet processing throughput is high enough that many applications won’t notice, but in +# On bare metal, the floor for packet processing throughput is high enough that many applications won't notice, but in # virtualized environments, the point at which an application can be bound by network packet processing can be -# surprisingly low compared to the throughput of task processing that is possible inside a VM. It’s not that bare metal -# doesn’t benefit from coalescing messages, it’s that the number of packets a bare metal network interface can process +# surprisingly low compared to the throughput of task processing that is possible inside a VM. It's not that bare metal +# doesn't benefit from coalescing messages, it's that the number of packets a bare metal network interface can process # is sufficient for many applications such that no load starvation is experienced even without coalescing. # There are other benefits to coalescing network messages that are harder to isolate with a simple metric like messages # per second. By coalescing multiple tasks together, a network thread can process multiple messages for the cost of one
[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Merge branch 'cassandra-3.11' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/48bfc8e8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/48bfc8e8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/48bfc8e8 Branch: refs/heads/trunk Commit: 48bfc8e8dcd926ea547211fd959cebba8c0e027b Parents: 3f3db2d 23a1dee Author: Ariel Weisberg Authored: Tue Feb 14 15:14:15 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 14 15:14:15 2017 -0500 -- conf/cassandra.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/48bfc8e8/conf/cassandra.yaml --
[02/10] cassandra git commit: Remove non-ascii characters from cassandra.yaml introduced by CASSANDRA-13090
Remove non-ascii characters from cassandra.yaml introduced by CASSANDRA-13090 patch by Ariel Weisberg; reviewed by Jason Brown for CASSANDRA-13219 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a80f803 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a80f803 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a80f803 Branch: refs/heads/cassandra-3.0 Commit: 9a80f803c2ec9a4a74cb8a99293dc81ef3dc183d Parents: 5725e2c Author: Ariel Weisberg Authored: Tue Feb 14 15:09:20 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 14 15:09:20 2017 -0500 -- conf/cassandra.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a80f803/conf/cassandra.yaml -- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index ddb7927..41c1fb1 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -892,10 +892,10 @@ windows_timer_interval: 1 # Coalescing Strategies # # Coalescing multiples messages turns out to significantly boost message processing throughput (think doubling or more). -# On bare metal, the floor for packet processing throughput is high enough that many applications won’t notice, but in +# On bare metal, the floor for packet processing throughput is high enough that many applications won't notice, but in # virtualized environments, the point at which an application can be bound by network packet processing can be -# surprisingly low compared to the throughput of task processing that is possible inside a VM. It’s not that bare metal -# doesn’t benefit from coalescing messages, it’s that the number of packets a bare metal network interface can process +# surprisingly low compared to the throughput of task processing that is possible inside a VM. It's not that bare metal +# doesn't benefit from coalescing messages, it's that the number of packets a bare metal network interface can process # is sufficient for many applications such that no load starvation is experienced even without coalescing. # There are other benefits to coalescing network messages that are harder to isolate with a simple metric like messages # per second. By coalescing multiple tasks together, a network thread can process multiple messages for the cost of one
[03/10] cassandra git commit: Remove non-ascii characters from cassandra.yaml introduced by CASSANDRA-13090
Remove non-ascii characters from cassandra.yaml introduced by CASSANDRA-13090 patch by Ariel Weisberg; reviewed by Jason Brown for CASSANDRA-13219 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a80f803 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a80f803 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a80f803 Branch: refs/heads/cassandra-3.11 Commit: 9a80f803c2ec9a4a74cb8a99293dc81ef3dc183d Parents: 5725e2c Author: Ariel Weisberg Authored: Tue Feb 14 15:09:20 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 14 15:09:20 2017 -0500 -- conf/cassandra.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a80f803/conf/cassandra.yaml -- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index ddb7927..41c1fb1 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -892,10 +892,10 @@ windows_timer_interval: 1 # Coalescing Strategies # # Coalescing multiples messages turns out to significantly boost message processing throughput (think doubling or more). -# On bare metal, the floor for packet processing throughput is high enough that many applications won’t notice, but in +# On bare metal, the floor for packet processing throughput is high enough that many applications won't notice, but in # virtualized environments, the point at which an application can be bound by network packet processing can be -# surprisingly low compared to the throughput of task processing that is possible inside a VM. It’s not that bare metal -# doesn’t benefit from coalescing messages, it’s that the number of packets a bare metal network interface can process +# surprisingly low compared to the throughput of task processing that is possible inside a VM. It's not that bare metal +# doesn't benefit from coalescing messages, it's that the number of packets a bare metal network interface can process # is sufficient for many applications such that no load starvation is experienced even without coalescing. # There are other benefits to coalescing network messages that are harder to isolate with a simple metric like messages # per second. By coalescing multiple tasks together, a network thread can process multiple messages for the cost of one
[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23a1dee4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23a1dee4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23a1dee4 Branch: refs/heads/trunk Commit: 23a1dee45f43ea241deb6b677d8c42cb3e9d45a0 Parents: 702ec08 82943d6 Author: Ariel Weisberg Authored: Tue Feb 14 15:13:39 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 14 15:13:39 2017 -0500 -- conf/cassandra.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/23a1dee4/conf/cassandra.yaml -- diff --cc conf/cassandra.yaml index 063a0b7,790dfd7..90e28b2 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@@ -1173,34 -959,12 +1173,34 @@@ gc_warn_threshold_in_ms: 100 # as corrupted. # max_value_size_in_mb: 256 +# Back-pressure settings # +# If enabled, the coordinator will apply the back-pressure strategy specified below to each mutation +# sent to replicas, with the aim of reducing pressure on overloaded replicas. +back_pressure_enabled: false +# The back-pressure strategy applied. +# The default implementation, RateBasedBackPressure, takes three arguments: +# high ratio, factor, and flow type, and uses the ratio between incoming mutation responses and outgoing mutation requests. +# If below high ratio, outgoing mutations are rate limited according to the incoming rate decreased by the given factor; +# if above high ratio, the rate limiting is increased by the given factor; +# such factor is usually best configured between 1 and 10, use larger values for a faster recovery +# at the expense of potentially more dropped mutations; +# the rate limiting is applied according to the flow type: if FAST, it's rate limited at the speed of the fastest replica, +# if SLOW at the speed of the slowest one. +# New strategies can be added. Implementors need to implement org.apache.cassandra.net.BackpressureStrategy and +# provide a public constructor accepting a Map. +back_pressure_strategy: +- class_name: org.apache.cassandra.net.RateBasedBackPressure + parameters: +- high_ratio: 0.90 + factor: 5 + flow: FAST + # Coalescing Strategies # # Coalescing multiples messages turns out to significantly boost message processing throughput (think doubling or more). - # On bare metal, the floor for packet processing throughput is high enough that many applications won’t notice, but in + # On bare metal, the floor for packet processing throughput is high enough that many applications won't notice, but in # virtualized environments, the point at which an application can be bound by network packet processing can be - # surprisingly low compared to the throughput of task processing that is possible inside a VM. It’s not that bare metal - # doesn’t benefit from coalescing messages, it’s that the number of packets a bare metal network interface can process + # surprisingly low compared to the throughput of task processing that is possible inside a VM. It's not that bare metal + # doesn't benefit from coalescing messages, it's that the number of packets a bare metal network interface can process # is sufficient for many applications such that no load starvation is experienced even without coalescing. # There are other benefits to coalescing network messages that are harder to isolate with a simple metric like messages # per second. By coalescing multiple tasks together, a network thread can process multiple messages for the cost of one
[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Merge branch 'cassandra-3.11' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bda97326 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bda97326 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bda97326 Branch: refs/heads/trunk Commit: bda973264d157485253742d2364c6c6467eea0b1 Parents: f97db26 c382a90 Author: Ariel Weisberg Authored: Tue Feb 21 12:17:31 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 21 12:17:31 2017 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bda97326/CHANGES.txt --
[02/10] cassandra git commit: Correct CHANGES.txt for CASSANDRA-13090
Correct CHANGES.txt for CASSANDRA-13090 Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13090 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c6462d79 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c6462d79 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c6462d79 Branch: refs/heads/cassandra-3.0 Commit: c6462d793b5736b7728c6f188b224dd9d3760bc6 Parents: 3f45010 Author: Ariel Weisberg Authored: Tue Feb 21 12:04:49 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 21 12:04:49 2017 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6462d79/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 7073356..78f55f6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,7 +3,7 @@ * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018) 2.2.9 - * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090) + * Coalescing strategy sleeps too much (CASSANDRA-13090) * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) * Fix speculative retry bugs (CASSANDRA-13009)
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c382a900 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c382a900 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c382a900 Branch: refs/heads/cassandra-3.11 Commit: c382a900b8059303f5ee1632650bc560e40c7cdf Parents: 87e8c6b 5022264 Author: Ariel Weisberg Authored: Tue Feb 21 12:17:02 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 21 12:17:02 2017 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c382a900/CHANGES.txt -- diff --cc CHANGES.txt index a98e43d,f2419d6..846fc20 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -219,21 -107,6 +219,21 @@@ Merged from 3.0 * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776) * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545) Merged from 2.2: - * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090) ++ * Coalescing strategy sleeps too much (CASSANDRA-13090) + * Fix speculative retry bugs (CASSANDRA-13009) + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) + * Fix race causing infinite loop if Thrift server is stopped before it starts listening (CASSANDRA-12856) + * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979) + * Remove support for non-JavaScript UDFs (CASSANDRA-12883) + * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074) + * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909) + * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616) + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796) + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980) + * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935) + * cqlsh: fix DESC TYPES errors (CASSANDRA-12914) + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899) + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281) * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792) * Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901) * cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863)
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
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/50222647 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50222647 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50222647 Branch: refs/heads/cassandra-3.11 Commit: 50222647481396c15d2465eced02c007f1493b53 Parents: 0020e79 c6462d7 Author: Ariel Weisberg Authored: Tue Feb 21 12:13:55 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 21 12:13:55 2017 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/50222647/CHANGES.txt -- diff --cc CHANGES.txt index 922e7f7,78f55f6..f2419d6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -3,48 -2,8 +3,48 @@@ Merged from 2. * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222) * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018) -2.2.9 +3.0.11 + * Use keyspace replication settings on system.size_estimates table (CASSANDRA-9639) + * Add vm.max_map_count StartupCheck (CASSANDRA-13008) + * Hint related logging should include the IP address of the destination in addition to + host ID (CASSANDRA-13205) + * Reloading logback.xml does not work (CASSANDRA-13173) + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109) + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125) + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152) + * Abort or retry on failed hints delivery (CASSANDRA-13124) + * Fix handling of partition with partition-level deletion plus + live rows in sstabledump (CASSANDRA-13177) + * Provide user workaround when system_schema.columns does not contain entries + for a table that's in system_schema.tables (CASSANDRA-13180) + * Dump threads when unit tests time out (CASSANDRA-13117) + * Better error when modifying function permissions without explicit keyspace (CASSANDRA-12925) + * Indexer is not correctly invoked when building indexes over sstables (CASSANDRA-13075) + * Read repair is not blocking repair to finish in foreground repair (CASSANDRA-13115) + * Stress daemon help is incorrect (CASSANDRA-12563) + * Remove ALTER TYPE support (CASSANDRA-12443) + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203) + * Set javac encoding to utf-8 (CASSANDRA-11077) + * Replace empty strings with null values if they cannot be converted (CASSANDRA-12794) + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620) + * Add parent repair session id to anticompaction log message (CASSANDRA-12186) + * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905) + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829) + * Mark MVs as built after successful bootstrap (CASSANDRA-12984) + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040) + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021) + * Thread local pools never cleaned up (CASSANDRA-13033) + * Set RPC_READY to false when draining or if a node is marked as shutdown (CASSANDRA-12781) + * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956) + * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868) + * Nodetool should use a more sane max heap size (CASSANDRA-12739) + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651) + * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934) + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535) + * Reenable HeapPool (CASSANDRA-12900) +Merged from 2.2: - * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090) + * Coalescing strategy sleeps too much (CASSANDRA-13090) * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) * Fix speculative retry bugs (CASSANDRA-13009)
[04/10] cassandra git commit: Correct CHANGES.txt for CASSANDRA-13090
Correct CHANGES.txt for CASSANDRA-13090 Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13090 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c6462d79 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c6462d79 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c6462d79 Branch: refs/heads/trunk Commit: c6462d793b5736b7728c6f188b224dd9d3760bc6 Parents: 3f45010 Author: Ariel Weisberg Authored: Tue Feb 21 12:04:49 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 21 12:04:49 2017 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6462d79/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 7073356..78f55f6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,7 +3,7 @@ * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018) 2.2.9 - * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090) + * Coalescing strategy sleeps too much (CASSANDRA-13090) * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) * Fix speculative retry bugs (CASSANDRA-13009)
[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c382a900 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c382a900 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c382a900 Branch: refs/heads/trunk Commit: c382a900b8059303f5ee1632650bc560e40c7cdf Parents: 87e8c6b 5022264 Author: Ariel Weisberg Authored: Tue Feb 21 12:17:02 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 21 12:17:02 2017 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c382a900/CHANGES.txt -- diff --cc CHANGES.txt index a98e43d,f2419d6..846fc20 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -219,21 -107,6 +219,21 @@@ Merged from 3.0 * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776) * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545) Merged from 2.2: - * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090) ++ * Coalescing strategy sleeps too much (CASSANDRA-13090) + * Fix speculative retry bugs (CASSANDRA-13009) + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) + * Fix race causing infinite loop if Thrift server is stopped before it starts listening (CASSANDRA-12856) + * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979) + * Remove support for non-JavaScript UDFs (CASSANDRA-12883) + * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074) + * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909) + * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616) + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796) + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980) + * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935) + * cqlsh: fix DESC TYPES errors (CASSANDRA-12914) + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899) + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281) * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792) * Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901) * cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863)
[03/10] cassandra git commit: Correct CHANGES.txt for CASSANDRA-13090
Correct CHANGES.txt for CASSANDRA-13090 Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13090 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c6462d79 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c6462d79 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c6462d79 Branch: refs/heads/cassandra-3.11 Commit: c6462d793b5736b7728c6f188b224dd9d3760bc6 Parents: 3f45010 Author: Ariel Weisberg Authored: Tue Feb 21 12:04:49 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 21 12:04:49 2017 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6462d79/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 7073356..78f55f6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,7 +3,7 @@ * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018) 2.2.9 - * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090) + * Coalescing strategy sleeps too much (CASSANDRA-13090) * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) * Fix speculative retry bugs (CASSANDRA-13009)
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
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/50222647 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50222647 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50222647 Branch: refs/heads/cassandra-3.0 Commit: 50222647481396c15d2465eced02c007f1493b53 Parents: 0020e79 c6462d7 Author: Ariel Weisberg Authored: Tue Feb 21 12:13:55 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 21 12:13:55 2017 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/50222647/CHANGES.txt -- diff --cc CHANGES.txt index 922e7f7,78f55f6..f2419d6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -3,48 -2,8 +3,48 @@@ Merged from 2. * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222) * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018) -2.2.9 +3.0.11 + * Use keyspace replication settings on system.size_estimates table (CASSANDRA-9639) + * Add vm.max_map_count StartupCheck (CASSANDRA-13008) + * Hint related logging should include the IP address of the destination in addition to + host ID (CASSANDRA-13205) + * Reloading logback.xml does not work (CASSANDRA-13173) + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109) + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125) + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152) + * Abort or retry on failed hints delivery (CASSANDRA-13124) + * Fix handling of partition with partition-level deletion plus + live rows in sstabledump (CASSANDRA-13177) + * Provide user workaround when system_schema.columns does not contain entries + for a table that's in system_schema.tables (CASSANDRA-13180) + * Dump threads when unit tests time out (CASSANDRA-13117) + * Better error when modifying function permissions without explicit keyspace (CASSANDRA-12925) + * Indexer is not correctly invoked when building indexes over sstables (CASSANDRA-13075) + * Read repair is not blocking repair to finish in foreground repair (CASSANDRA-13115) + * Stress daemon help is incorrect (CASSANDRA-12563) + * Remove ALTER TYPE support (CASSANDRA-12443) + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203) + * Set javac encoding to utf-8 (CASSANDRA-11077) + * Replace empty strings with null values if they cannot be converted (CASSANDRA-12794) + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620) + * Add parent repair session id to anticompaction log message (CASSANDRA-12186) + * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905) + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829) + * Mark MVs as built after successful bootstrap (CASSANDRA-12984) + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040) + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021) + * Thread local pools never cleaned up (CASSANDRA-13033) + * Set RPC_READY to false when draining or if a node is marked as shutdown (CASSANDRA-12781) + * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956) + * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868) + * Nodetool should use a more sane max heap size (CASSANDRA-12739) + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651) + * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934) + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535) + * Reenable HeapPool (CASSANDRA-12900) +Merged from 2.2: - * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090) + * Coalescing strategy sleeps too much (CASSANDRA-13090) * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) * Fix speculative retry bugs (CASSANDRA-13009)
[01/10] cassandra git commit: Correct CHANGES.txt for CASSANDRA-13090
Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 3f4501077 -> c6462d793 refs/heads/cassandra-3.0 0020e79f8 -> 502226474 refs/heads/cassandra-3.11 87e8c6be7 -> c382a900b refs/heads/trunk f97db26f8 -> bda973264 Correct CHANGES.txt for CASSANDRA-13090 Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13090 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c6462d79 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c6462d79 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c6462d79 Branch: refs/heads/cassandra-2.2 Commit: c6462d793b5736b7728c6f188b224dd9d3760bc6 Parents: 3f45010 Author: Ariel Weisberg Authored: Tue Feb 21 12:04:49 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 21 12:04:49 2017 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6462d79/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 7073356..78f55f6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,7 +3,7 @@ * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018) 2.2.9 - * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090) + * Coalescing strategy sleeps too much (CASSANDRA-13090) * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) * Fix speculative retry bugs (CASSANDRA-13009)
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
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/50222647 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50222647 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50222647 Branch: refs/heads/trunk Commit: 50222647481396c15d2465eced02c007f1493b53 Parents: 0020e79 c6462d7 Author: Ariel Weisberg Authored: Tue Feb 21 12:13:55 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 21 12:13:55 2017 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/50222647/CHANGES.txt -- diff --cc CHANGES.txt index 922e7f7,78f55f6..f2419d6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -3,48 -2,8 +3,48 @@@ Merged from 2. * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222) * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018) -2.2.9 +3.0.11 + * Use keyspace replication settings on system.size_estimates table (CASSANDRA-9639) + * Add vm.max_map_count StartupCheck (CASSANDRA-13008) + * Hint related logging should include the IP address of the destination in addition to + host ID (CASSANDRA-13205) + * Reloading logback.xml does not work (CASSANDRA-13173) + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109) + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125) + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152) + * Abort or retry on failed hints delivery (CASSANDRA-13124) + * Fix handling of partition with partition-level deletion plus + live rows in sstabledump (CASSANDRA-13177) + * Provide user workaround when system_schema.columns does not contain entries + for a table that's in system_schema.tables (CASSANDRA-13180) + * Dump threads when unit tests time out (CASSANDRA-13117) + * Better error when modifying function permissions without explicit keyspace (CASSANDRA-12925) + * Indexer is not correctly invoked when building indexes over sstables (CASSANDRA-13075) + * Read repair is not blocking repair to finish in foreground repair (CASSANDRA-13115) + * Stress daemon help is incorrect (CASSANDRA-12563) + * Remove ALTER TYPE support (CASSANDRA-12443) + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203) + * Set javac encoding to utf-8 (CASSANDRA-11077) + * Replace empty strings with null values if they cannot be converted (CASSANDRA-12794) + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620) + * Add parent repair session id to anticompaction log message (CASSANDRA-12186) + * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905) + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829) + * Mark MVs as built after successful bootstrap (CASSANDRA-12984) + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040) + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021) + * Thread local pools never cleaned up (CASSANDRA-13033) + * Set RPC_READY to false when draining or if a node is marked as shutdown (CASSANDRA-12781) + * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956) + * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868) + * Nodetool should use a more sane max heap size (CASSANDRA-12739) + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651) + * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934) + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535) + * Reenable HeapPool (CASSANDRA-12900) +Merged from 2.2: - * Coalescing strategy sleeps too much and shouldn't be enabled by default (CASSANDRA-13090) + * Coalescing strategy sleeps too much (CASSANDRA-13090) * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) * Fix speculative retry bugs (CASSANDRA-13009)
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
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/df28bcfa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df28bcfa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df28bcfa Branch: refs/heads/cassandra-3.0 Commit: df28bcfaaa3df95bcd06a399e487b4174ff96462 Parents: a5ce963 3748bf7 Author: Ariel Weisberg Authored: Tue Feb 28 17:58:33 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 28 17:59:37 2017 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/df28bcfa/CHANGES.txt -- diff --cc CHANGES.txt index 1100bfd,e7e0367..5cdc2e4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,6 +1,10 @@@ -2.2.10 +3.0.12 + * Faster StreamingHistogram (CASSANDRA-13038) + * Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237) + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070) + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185) +Merged from 2.2 + * Coalescing strategy sleeps too much (CASSANDRA-13090) - * Make sure compaction stats are updated when compaction is interrupted (Backport from 3.0, CASSANDRA-12100) * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202) * Fix failing COPY TO STDOUT (CASSANDRA-12497) * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222) @@@ -11,48 -8,7 +12,47 @@@ Merged from 2.1: * Log stacktrace of uncaught exceptions (CASSANDRA-13108) -2.2.9 +3.0.11 + * Use keyspace replication settings on system.size_estimates table (CASSANDRA-9639) + * Add vm.max_map_count StartupCheck (CASSANDRA-13008) + * Hint related logging should include the IP address of the destination in addition to + host ID (CASSANDRA-13205) + * Reloading logback.xml does not work (CASSANDRA-13173) + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109) + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125) + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152) + * Abort or retry on failed hints delivery (CASSANDRA-13124) + * Fix handling of partition with partition-level deletion plus + live rows in sstabledump (CASSANDRA-13177) + * Provide user workaround when system_schema.columns does not contain entries + for a table that's in system_schema.tables (CASSANDRA-13180) + * Dump threads when unit tests time out (CASSANDRA-13117) + * Better error when modifying function permissions without explicit keyspace (CASSANDRA-12925) + * Indexer is not correctly invoked when building indexes over sstables (CASSANDRA-13075) + * Read repair is not blocking repair to finish in foreground repair (CASSANDRA-13115) + * Stress daemon help is incorrect (CASSANDRA-12563) + * Remove ALTER TYPE support (CASSANDRA-12443) + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203) + * Set javac encoding to utf-8 (CASSANDRA-11077) + * Replace empty strings with null values if they cannot be converted (CASSANDRA-12794) + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620) + * Add parent repair session id to anticompaction log message (CASSANDRA-12186) + * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905) + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829) + * Mark MVs as built after successful bootstrap (CASSANDRA-12984) + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040) + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021) + * Thread local pools never cleaned up (CASSANDRA-13033) + * Set RPC_READY to false when draining or if a node is marked as shutdown (CASSANDRA-12781) + * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956) + * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868) + * Nodetool should use a more sane max heap size (CASSANDRA-12739) + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651) + * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934) + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535) + * Reenable HeapPool (CASSANDRA-12900) +Merged from 2.2: - * Coalescing strategy sleeps too much (CASSANDRA-13090) * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539)
[03/10] cassandra git commit: Fix CHANGES.txt versions for CASSANDRA-13090.
Fix CHANGES.txt versions for CASSANDRA-13090. Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13090. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3748bf7c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3748bf7c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3748bf7c Branch: refs/heads/cassandra-3.11 Commit: 3748bf7c2a135baab33ccd3b79db5f3fb9132995 Parents: dffb1a6 Author: Ariel Weisberg Authored: Tue Feb 28 17:56:24 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 28 17:56:24 2017 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3748bf7c/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index b565acb..e7e0367 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2.10 + * Coalescing strategy sleeps too much (CASSANDRA-13090) * Make sure compaction stats are updated when compaction is interrupted (Backport from 3.0, CASSANDRA-12100) * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202) * Fix failing COPY TO STDOUT (CASSANDRA-12497) @@ -8,7 +9,6 @@ Merged from 2.1: * Log stacktrace of uncaught exceptions (CASSANDRA-13108) 2.2.9 - * Coalescing strategy sleeps too much (CASSANDRA-13090) * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) * Fix speculative retry bugs (CASSANDRA-13009)
[01/10] cassandra git commit: Fix CHANGES.txt versions for CASSANDRA-13090.
Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 dffb1a6da -> 3748bf7c2 refs/heads/cassandra-3.0 a5ce96311 -> df28bcfaa refs/heads/cassandra-3.11 942b83ca9 -> 91c8d9157 refs/heads/trunk d24f4c68d -> 895e6ce11 Fix CHANGES.txt versions for CASSANDRA-13090. Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13090. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3748bf7c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3748bf7c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3748bf7c Branch: refs/heads/cassandra-2.2 Commit: 3748bf7c2a135baab33ccd3b79db5f3fb9132995 Parents: dffb1a6 Author: Ariel Weisberg Authored: Tue Feb 28 17:56:24 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 28 17:56:24 2017 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3748bf7c/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index b565acb..e7e0367 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2.10 + * Coalescing strategy sleeps too much (CASSANDRA-13090) * Make sure compaction stats are updated when compaction is interrupted (Backport from 3.0, CASSANDRA-12100) * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202) * Fix failing COPY TO STDOUT (CASSANDRA-12497) @@ -8,7 +9,6 @@ Merged from 2.1: * Log stacktrace of uncaught exceptions (CASSANDRA-13108) 2.2.9 - * Coalescing strategy sleeps too much (CASSANDRA-13090) * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) * Fix speculative retry bugs (CASSANDRA-13009)
[04/10] cassandra git commit: Fix CHANGES.txt versions for CASSANDRA-13090.
Fix CHANGES.txt versions for CASSANDRA-13090. Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13090. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3748bf7c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3748bf7c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3748bf7c Branch: refs/heads/trunk Commit: 3748bf7c2a135baab33ccd3b79db5f3fb9132995 Parents: dffb1a6 Author: Ariel Weisberg Authored: Tue Feb 28 17:56:24 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 28 17:56:24 2017 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3748bf7c/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index b565acb..e7e0367 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2.10 + * Coalescing strategy sleeps too much (CASSANDRA-13090) * Make sure compaction stats are updated when compaction is interrupted (Backport from 3.0, CASSANDRA-12100) * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202) * Fix failing COPY TO STDOUT (CASSANDRA-12497) @@ -8,7 +9,6 @@ Merged from 2.1: * Log stacktrace of uncaught exceptions (CASSANDRA-13108) 2.2.9 - * Coalescing strategy sleeps too much (CASSANDRA-13090) * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) * Fix speculative retry bugs (CASSANDRA-13009)
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
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/df28bcfa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df28bcfa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df28bcfa Branch: refs/heads/trunk Commit: df28bcfaaa3df95bcd06a399e487b4174ff96462 Parents: a5ce963 3748bf7 Author: Ariel Weisberg Authored: Tue Feb 28 17:58:33 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 28 17:59:37 2017 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/df28bcfa/CHANGES.txt -- diff --cc CHANGES.txt index 1100bfd,e7e0367..5cdc2e4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,6 +1,10 @@@ -2.2.10 +3.0.12 + * Faster StreamingHistogram (CASSANDRA-13038) + * Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237) + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070) + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185) +Merged from 2.2 + * Coalescing strategy sleeps too much (CASSANDRA-13090) - * Make sure compaction stats are updated when compaction is interrupted (Backport from 3.0, CASSANDRA-12100) * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202) * Fix failing COPY TO STDOUT (CASSANDRA-12497) * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222) @@@ -11,48 -8,7 +12,47 @@@ Merged from 2.1: * Log stacktrace of uncaught exceptions (CASSANDRA-13108) -2.2.9 +3.0.11 + * Use keyspace replication settings on system.size_estimates table (CASSANDRA-9639) + * Add vm.max_map_count StartupCheck (CASSANDRA-13008) + * Hint related logging should include the IP address of the destination in addition to + host ID (CASSANDRA-13205) + * Reloading logback.xml does not work (CASSANDRA-13173) + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109) + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125) + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152) + * Abort or retry on failed hints delivery (CASSANDRA-13124) + * Fix handling of partition with partition-level deletion plus + live rows in sstabledump (CASSANDRA-13177) + * Provide user workaround when system_schema.columns does not contain entries + for a table that's in system_schema.tables (CASSANDRA-13180) + * Dump threads when unit tests time out (CASSANDRA-13117) + * Better error when modifying function permissions without explicit keyspace (CASSANDRA-12925) + * Indexer is not correctly invoked when building indexes over sstables (CASSANDRA-13075) + * Read repair is not blocking repair to finish in foreground repair (CASSANDRA-13115) + * Stress daemon help is incorrect (CASSANDRA-12563) + * Remove ALTER TYPE support (CASSANDRA-12443) + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203) + * Set javac encoding to utf-8 (CASSANDRA-11077) + * Replace empty strings with null values if they cannot be converted (CASSANDRA-12794) + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620) + * Add parent repair session id to anticompaction log message (CASSANDRA-12186) + * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905) + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829) + * Mark MVs as built after successful bootstrap (CASSANDRA-12984) + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040) + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021) + * Thread local pools never cleaned up (CASSANDRA-13033) + * Set RPC_READY to false when draining or if a node is marked as shutdown (CASSANDRA-12781) + * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956) + * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868) + * Nodetool should use a more sane max heap size (CASSANDRA-12739) + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651) + * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934) + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535) + * Reenable HeapPool (CASSANDRA-12900) +Merged from 2.2: - * Coalescing strategy sleeps too much (CASSANDRA-13090) * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) * Fix sp
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91c8d915 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91c8d915 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91c8d915 Branch: refs/heads/cassandra-3.11 Commit: 91c8d915742a8dfcd1ef28b1e326ec201ee68c9c Parents: 942b83c df28bcf Author: Ariel Weisberg Authored: Tue Feb 28 18:00:07 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 28 18:01:06 2017 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/91c8d915/CHANGES.txt -- diff --cc CHANGES.txt index 1810cae,5cdc2e4..1cced71 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,4 +1,14 @@@ -3.0.12 +3.11.0 + * Fix equality comparisons of columns using the duration type (CASSANDRA-13174) + * Obfuscate password in stress-graphs (CASSANDRA-12233) + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034) + * nodetool stopdaemon errors out (CASSANDRA-13030) + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954) + * Fix primary index calculation for SASI (CASSANDRA-12910) + * More fixes to the TokenAllocator (CASSANDRA-12990) + * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983) +Merged from 3.0: ++ * Coalescing strategy sleeps too much (CASSANDRA-13090) * Faster StreamingHistogram (CASSANDRA-13038) * Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237) * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070) @@@ -227,21 -115,6 +228,20 @@@ Merged from 3.0 * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776) * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545) Merged from 2.2: - * Coalescing strategy sleeps too much (CASSANDRA-13090) + * Fix speculative retry bugs (CASSANDRA-13009) + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) + * Fix race causing infinite loop if Thrift server is stopped before it starts listening (CASSANDRA-12856) + * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979) + * Remove support for non-JavaScript UDFs (CASSANDRA-12883) + * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074) + * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909) + * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616) + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796) + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980) + * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935) + * cqlsh: fix DESC TYPES errors (CASSANDRA-12914) + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899) + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281) * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792) * Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901) * cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863)
[02/10] cassandra git commit: Fix CHANGES.txt versions for CASSANDRA-13090.
Fix CHANGES.txt versions for CASSANDRA-13090. Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13090. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3748bf7c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3748bf7c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3748bf7c Branch: refs/heads/cassandra-3.0 Commit: 3748bf7c2a135baab33ccd3b79db5f3fb9132995 Parents: dffb1a6 Author: Ariel Weisberg Authored: Tue Feb 28 17:56:24 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 28 17:56:24 2017 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3748bf7c/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index b565acb..e7e0367 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2.10 + * Coalescing strategy sleeps too much (CASSANDRA-13090) * Make sure compaction stats are updated when compaction is interrupted (Backport from 3.0, CASSANDRA-12100) * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202) * Fix failing COPY TO STDOUT (CASSANDRA-12497) @@ -8,7 +9,6 @@ Merged from 2.1: * Log stacktrace of uncaught exceptions (CASSANDRA-13108) 2.2.9 - * Coalescing strategy sleeps too much (CASSANDRA-13090) * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539) * Fix speculative retry bugs (CASSANDRA-13009)
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
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/df28bcfa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df28bcfa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df28bcfa Branch: refs/heads/cassandra-3.11 Commit: df28bcfaaa3df95bcd06a399e487b4174ff96462 Parents: a5ce963 3748bf7 Author: Ariel Weisberg Authored: Tue Feb 28 17:58:33 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 28 17:59:37 2017 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/df28bcfa/CHANGES.txt -- diff --cc CHANGES.txt index 1100bfd,e7e0367..5cdc2e4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,6 +1,10 @@@ -2.2.10 +3.0.12 + * Faster StreamingHistogram (CASSANDRA-13038) + * Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237) + * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070) + * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185) +Merged from 2.2 + * Coalescing strategy sleeps too much (CASSANDRA-13090) - * Make sure compaction stats are updated when compaction is interrupted (Backport from 3.0, CASSANDRA-12100) * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202) * Fix failing COPY TO STDOUT (CASSANDRA-12497) * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222) @@@ -11,48 -8,7 +12,47 @@@ Merged from 2.1: * Log stacktrace of uncaught exceptions (CASSANDRA-13108) -2.2.9 +3.0.11 + * Use keyspace replication settings on system.size_estimates table (CASSANDRA-9639) + * Add vm.max_map_count StartupCheck (CASSANDRA-13008) + * Hint related logging should include the IP address of the destination in addition to + host ID (CASSANDRA-13205) + * Reloading logback.xml does not work (CASSANDRA-13173) + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109) + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125) + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152) + * Abort or retry on failed hints delivery (CASSANDRA-13124) + * Fix handling of partition with partition-level deletion plus + live rows in sstabledump (CASSANDRA-13177) + * Provide user workaround when system_schema.columns does not contain entries + for a table that's in system_schema.tables (CASSANDRA-13180) + * Dump threads when unit tests time out (CASSANDRA-13117) + * Better error when modifying function permissions without explicit keyspace (CASSANDRA-12925) + * Indexer is not correctly invoked when building indexes over sstables (CASSANDRA-13075) + * Read repair is not blocking repair to finish in foreground repair (CASSANDRA-13115) + * Stress daemon help is incorrect (CASSANDRA-12563) + * Remove ALTER TYPE support (CASSANDRA-12443) + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203) + * Set javac encoding to utf-8 (CASSANDRA-11077) + * Replace empty strings with null values if they cannot be converted (CASSANDRA-12794) + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620) + * Add parent repair session id to anticompaction log message (CASSANDRA-12186) + * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905) + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829) + * Mark MVs as built after successful bootstrap (CASSANDRA-12984) + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME (CASSANDRA-13040) + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021) + * Thread local pools never cleaned up (CASSANDRA-13033) + * Set RPC_READY to false when draining or if a node is marked as shutdown (CASSANDRA-12781) + * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956) + * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868) + * Nodetool should use a more sane max heap size (CASSANDRA-12739) + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651) + * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934) + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535) + * Reenable HeapPool (CASSANDRA-12900) +Merged from 2.2: - * Coalescing strategy sleeps too much (CASSANDRA-13090) * Fix negative mean latency metric (CASSANDRA-12876) * Use only one file pointer when creating commitlog segments (CASSANDRA-12539)
[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Merge branch 'cassandra-3.11' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/895e6ce1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/895e6ce1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/895e6ce1 Branch: refs/heads/trunk Commit: 895e6ce11c4467011df106631d0f818fb2298d73 Parents: d24f4c6 91c8d91 Author: Ariel Weisberg Authored: Tue Feb 28 18:01:31 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 28 18:02:48 2017 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/895e6ce1/CHANGES.txt --
[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91c8d915 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91c8d915 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91c8d915 Branch: refs/heads/trunk Commit: 91c8d915742a8dfcd1ef28b1e326ec201ee68c9c Parents: 942b83c df28bcf Author: Ariel Weisberg Authored: Tue Feb 28 18:00:07 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 28 18:01:06 2017 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/91c8d915/CHANGES.txt -- diff --cc CHANGES.txt index 1810cae,5cdc2e4..1cced71 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,4 +1,14 @@@ -3.0.12 +3.11.0 + * Fix equality comparisons of columns using the duration type (CASSANDRA-13174) + * Obfuscate password in stress-graphs (CASSANDRA-12233) + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034) + * nodetool stopdaemon errors out (CASSANDRA-13030) + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954) + * Fix primary index calculation for SASI (CASSANDRA-12910) + * More fixes to the TokenAllocator (CASSANDRA-12990) + * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983) +Merged from 3.0: ++ * Coalescing strategy sleeps too much (CASSANDRA-13090) * Faster StreamingHistogram (CASSANDRA-13038) * Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237) * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070) @@@ -227,21 -115,6 +228,20 @@@ Merged from 3.0 * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776) * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545) Merged from 2.2: - * Coalescing strategy sleeps too much (CASSANDRA-13090) + * Fix speculative retry bugs (CASSANDRA-13009) + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) + * Fix race causing infinite loop if Thrift server is stopped before it starts listening (CASSANDRA-12856) + * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979) + * Remove support for non-JavaScript UDFs (CASSANDRA-12883) + * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074) + * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909) + * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616) + * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796) + * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980) + * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935) + * cqlsh: fix DESC TYPES errors (CASSANDRA-12914) + * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899) + * Avoid blocking gossip during pending range calculation (CASSANDRA-12281) * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792) * Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901) * cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863)
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
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/56d3f932
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56d3f932
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56d3f932
Branch: refs/heads/cassandra-3.0
Commit: 56d3f9324909be7b59ea057fc280faec28532f84
Parents: df28bcf aa66c99
Author: Ariel Weisberg
Authored: Tue Feb 28 19:49:52 2017 -0500
Committer: Ariel Weisberg
Committed: Tue Feb 28 19:49:52 2017 -0500
--
CHANGES.txt | 1 +
build.xml | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56d3f932/CHANGES.txt
--
diff --cc CHANGES.txt
index 5cdc2e4,c27c2b1..a63bd12
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,7 +1,11 @@@
-2.2.10
+3.0.12
+ * Faster StreamingHistogram (CASSANDRA-13038)
+ * Legacy deserializer can create unexpected boundary range tombstones
(CASSANDRA-13237)
+ * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
+ * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
+Merged from 2.2
+ * Fix "multiple versions of ant detected..." when running ant test
(CASSANDRA-13232)
* Coalescing strategy sleeps too much (CASSANDRA-13090)
- * Make sure compaction stats are updated when compaction is interrupted
(Backport from 3.0, CASSANDRA-12100)
* Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
* Fix failing COPY TO STDOUT (CASSANDRA-12497)
* Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56d3f932/build.xml
--
diff --cc build.xml
index 2d2d313,d815ede..69b6bdf
--- a/build.xml
+++ b/build.xml
@@@ -159,8 -152,13 +160,9 @@@
+
-
-
-
-
@@@ -1131,10 -1181,9 +1133,10 @@@
debug="true"
debuglevel="${debuglevel}"
destdir="${test.classes}"
- includeantruntime="false"
+ includeantruntime="true"
source="${source.version}"
- target="${target.version}">
+ target="${target.version}"
+ encoding="utf-8">
[04/10] cassandra git commit: Fix "multiple versions of ant detected..." when running ant test
Fix "multiple versions of ant detected..." when running ant test
Patch by Michael Kjellman; Reviewed by Ariel Weisberg for CASSANDRA-13232
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa66c999
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa66c999
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa66c999
Branch: refs/heads/trunk
Commit: aa66c999ad18e63f9c6b53a2da0750099ec7132c
Parents: 3748bf7
Author: Ariel Weisberg
Authored: Tue Feb 28 19:43:06 2017 -0500
Committer: Ariel Weisberg
Committed: Tue Feb 28 19:43:06 2017 -0500
--
CHANGES.txt | 1 +
build.xml | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa66c999/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index e7e0367..c27c2b1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.10
+ * Fix "multiple versions of ant detected..." when running ant test
(CASSANDRA-13232)
* Coalescing strategy sleeps too much (CASSANDRA-13090)
* Make sure compaction stats are updated when compaction is interrupted
(Backport from 3.0, CASSANDRA-12100)
* Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa66c999/build.xml
--
diff --git a/build.xml b/build.xml
index 53a1b27..d815ede 100644
--- a/build.xml
+++ b/build.xml
@@ -147,10 +147,12 @@
+
+
@@ -1179,7 +1181,7 @@
debug="true"
debuglevel="${debuglevel}"
destdir="${test.classes}"
- includeantruntime="false"
+ includeantruntime="true"
source="${source.version}"
target="${target.version}">
[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4bb5ada5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bb5ada5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4bb5ada5
Branch: refs/heads/trunk
Commit: 4bb5ada5358cb4287f445d9d49145e76f2bf3a07
Parents: 895e6ce 760d6c3
Author: Ariel Weisberg
Authored: Tue Feb 28 19:57:57 2017 -0500
Committer: Ariel Weisberg
Committed: Tue Feb 28 19:57:57 2017 -0500
--
CHANGES.txt | 1 +
build.xml | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bb5ada5/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bb5ada5/build.xml
--
diff --cc build.xml
index 8fde61b,dcaa780..e2bbe94
--- a/build.xml
+++ b/build.xml
@@@ -1057,8 -1198,8 +1059,8 @@@
debug="true"
debuglevel="${debuglevel}"
destdir="${test.classes}"
- includeantruntime="false"
+ includeantruntime="true"
- source="${source.version}"
+ source="${source.version}"
target="${target.version}"
encoding="utf-8">
[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/760d6c33 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/760d6c33 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/760d6c33 Branch: refs/heads/trunk Commit: 760d6c33d5727d94e89afb2e43d551f10a2721b7 Parents: 91c8d91 56d3f93 Author: Ariel Weisberg Authored: Tue Feb 28 19:54:59 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 28 19:54:59 2017 -0500 -- CHANGES.txt | 1 + build.xml | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/760d6c33/CHANGES.txt -- diff --cc CHANGES.txt index 1cced71,a63bd12..497f5c4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,4 +1,15 @@@ -3.0.12 +3.11.0 + * Fix equality comparisons of columns using the duration type (CASSANDRA-13174) + * Obfuscate password in stress-graphs (CASSANDRA-12233) + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034) + * nodetool stopdaemon errors out (CASSANDRA-13030) + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954) + * Fix primary index calculation for SASI (CASSANDRA-12910) + * More fixes to the TokenAllocator (CASSANDRA-12990) + * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983) +Merged from 3.0: ++ * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232) + * Coalescing strategy sleeps too much (CASSANDRA-13090) * Faster StreamingHistogram (CASSANDRA-13038) * Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237) * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070) http://git-wip-us.apache.org/repos/asf/cassandra/blob/760d6c33/build.xml -- diff --cc build.xml index 0eef700,69b6bdf..dcaa780 --- a/build.xml +++ b/build.xml @@@ -156,12 -153,14 +156,14 @@@ - - - + + ++ - - - + + ++
[02/10] cassandra git commit: Fix "multiple versions of ant detected..." when running ant test
Fix "multiple versions of ant detected..." when running ant test
Patch by Michael Kjellman; Reviewed by Ariel Weisberg for CASSANDRA-13232
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa66c999
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa66c999
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa66c999
Branch: refs/heads/cassandra-3.0
Commit: aa66c999ad18e63f9c6b53a2da0750099ec7132c
Parents: 3748bf7
Author: Ariel Weisberg
Authored: Tue Feb 28 19:43:06 2017 -0500
Committer: Ariel Weisberg
Committed: Tue Feb 28 19:43:06 2017 -0500
--
CHANGES.txt | 1 +
build.xml | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa66c999/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index e7e0367..c27c2b1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.10
+ * Fix "multiple versions of ant detected..." when running ant test
(CASSANDRA-13232)
* Coalescing strategy sleeps too much (CASSANDRA-13090)
* Make sure compaction stats are updated when compaction is interrupted
(Backport from 3.0, CASSANDRA-12100)
* Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa66c999/build.xml
--
diff --git a/build.xml b/build.xml
index 53a1b27..d815ede 100644
--- a/build.xml
+++ b/build.xml
@@ -147,10 +147,12 @@
+
+
@@ -1179,7 +1181,7 @@
debug="true"
debuglevel="${debuglevel}"
destdir="${test.classes}"
- includeantruntime="false"
+ includeantruntime="true"
source="${source.version}"
target="${target.version}">
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
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/56d3f932
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56d3f932
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56d3f932
Branch: refs/heads/trunk
Commit: 56d3f9324909be7b59ea057fc280faec28532f84
Parents: df28bcf aa66c99
Author: Ariel Weisberg
Authored: Tue Feb 28 19:49:52 2017 -0500
Committer: Ariel Weisberg
Committed: Tue Feb 28 19:49:52 2017 -0500
--
CHANGES.txt | 1 +
build.xml | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56d3f932/CHANGES.txt
--
diff --cc CHANGES.txt
index 5cdc2e4,c27c2b1..a63bd12
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,7 +1,11 @@@
-2.2.10
+3.0.12
+ * Faster StreamingHistogram (CASSANDRA-13038)
+ * Legacy deserializer can create unexpected boundary range tombstones
(CASSANDRA-13237)
+ * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
+ * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
+Merged from 2.2
+ * Fix "multiple versions of ant detected..." when running ant test
(CASSANDRA-13232)
* Coalescing strategy sleeps too much (CASSANDRA-13090)
- * Make sure compaction stats are updated when compaction is interrupted
(Backport from 3.0, CASSANDRA-12100)
* Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
* Fix failing COPY TO STDOUT (CASSANDRA-12497)
* Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56d3f932/build.xml
--
diff --cc build.xml
index 2d2d313,d815ede..69b6bdf
--- a/build.xml
+++ b/build.xml
@@@ -159,8 -152,13 +160,9 @@@
+
-
-
-
-
@@@ -1131,10 -1181,9 +1133,10 @@@
debug="true"
debuglevel="${debuglevel}"
destdir="${test.classes}"
- includeantruntime="false"
+ includeantruntime="true"
source="${source.version}"
- target="${target.version}">
+ target="${target.version}"
+ encoding="utf-8">
[03/10] cassandra git commit: Fix "multiple versions of ant detected..." when running ant test
Fix "multiple versions of ant detected..." when running ant test
Patch by Michael Kjellman; Reviewed by Ariel Weisberg for CASSANDRA-13232
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa66c999
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa66c999
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa66c999
Branch: refs/heads/cassandra-3.11
Commit: aa66c999ad18e63f9c6b53a2da0750099ec7132c
Parents: 3748bf7
Author: Ariel Weisberg
Authored: Tue Feb 28 19:43:06 2017 -0500
Committer: Ariel Weisberg
Committed: Tue Feb 28 19:43:06 2017 -0500
--
CHANGES.txt | 1 +
build.xml | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa66c999/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index e7e0367..c27c2b1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.10
+ * Fix "multiple versions of ant detected..." when running ant test
(CASSANDRA-13232)
* Coalescing strategy sleeps too much (CASSANDRA-13090)
* Make sure compaction stats are updated when compaction is interrupted
(Backport from 3.0, CASSANDRA-12100)
* Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa66c999/build.xml
--
diff --git a/build.xml b/build.xml
index 53a1b27..d815ede 100644
--- a/build.xml
+++ b/build.xml
@@ -147,10 +147,12 @@
+
+
@@ -1179,7 +1181,7 @@
debug="true"
debuglevel="${debuglevel}"
destdir="${test.classes}"
- includeantruntime="false"
+ includeantruntime="true"
source="${source.version}"
target="${target.version}">
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
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/56d3f932
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56d3f932
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56d3f932
Branch: refs/heads/cassandra-3.11
Commit: 56d3f9324909be7b59ea057fc280faec28532f84
Parents: df28bcf aa66c99
Author: Ariel Weisberg
Authored: Tue Feb 28 19:49:52 2017 -0500
Committer: Ariel Weisberg
Committed: Tue Feb 28 19:49:52 2017 -0500
--
CHANGES.txt | 1 +
build.xml | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56d3f932/CHANGES.txt
--
diff --cc CHANGES.txt
index 5cdc2e4,c27c2b1..a63bd12
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,7 +1,11 @@@
-2.2.10
+3.0.12
+ * Faster StreamingHistogram (CASSANDRA-13038)
+ * Legacy deserializer can create unexpected boundary range tombstones
(CASSANDRA-13237)
+ * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
+ * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
+Merged from 2.2
+ * Fix "multiple versions of ant detected..." when running ant test
(CASSANDRA-13232)
* Coalescing strategy sleeps too much (CASSANDRA-13090)
- * Make sure compaction stats are updated when compaction is interrupted
(Backport from 3.0, CASSANDRA-12100)
* Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
* Fix failing COPY TO STDOUT (CASSANDRA-12497)
* Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56d3f932/build.xml
--
diff --cc build.xml
index 2d2d313,d815ede..69b6bdf
--- a/build.xml
+++ b/build.xml
@@@ -159,8 -152,13 +160,9 @@@
+
-
-
-
-
@@@ -1131,10 -1181,9 +1133,10 @@@
debug="true"
debuglevel="${debuglevel}"
destdir="${test.classes}"
- includeantruntime="false"
+ includeantruntime="true"
source="${source.version}"
- target="${target.version}">
+ target="${target.version}"
+ encoding="utf-8">
[01/10] cassandra git commit: Fix "multiple versions of ant detected..." when running ant test
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 3748bf7c2 -> aa66c999a
refs/heads/cassandra-3.0 df28bcfaa -> 56d3f9324
refs/heads/cassandra-3.11 91c8d9157 -> 760d6c33d
refs/heads/trunk 895e6ce11 -> 4bb5ada53
Fix "multiple versions of ant detected..." when running ant test
Patch by Michael Kjellman; Reviewed by Ariel Weisberg for CASSANDRA-13232
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa66c999
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa66c999
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa66c999
Branch: refs/heads/cassandra-2.2
Commit: aa66c999ad18e63f9c6b53a2da0750099ec7132c
Parents: 3748bf7
Author: Ariel Weisberg
Authored: Tue Feb 28 19:43:06 2017 -0500
Committer: Ariel Weisberg
Committed: Tue Feb 28 19:43:06 2017 -0500
--
CHANGES.txt | 1 +
build.xml | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa66c999/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index e7e0367..c27c2b1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.10
+ * Fix "multiple versions of ant detected..." when running ant test
(CASSANDRA-13232)
* Coalescing strategy sleeps too much (CASSANDRA-13090)
* Make sure compaction stats are updated when compaction is interrupted
(Backport from 3.0, CASSANDRA-12100)
* Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa66c999/build.xml
--
diff --git a/build.xml b/build.xml
index 53a1b27..d815ede 100644
--- a/build.xml
+++ b/build.xml
@@ -147,10 +147,12 @@
+
+
@@ -1179,7 +1181,7 @@
debug="true"
debuglevel="${debuglevel}"
destdir="${test.classes}"
- includeantruntime="false"
+ includeantruntime="true"
source="${source.version}"
target="${target.version}">
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/760d6c33 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/760d6c33 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/760d6c33 Branch: refs/heads/cassandra-3.11 Commit: 760d6c33d5727d94e89afb2e43d551f10a2721b7 Parents: 91c8d91 56d3f93 Author: Ariel Weisberg Authored: Tue Feb 28 19:54:59 2017 -0500 Committer: Ariel Weisberg Committed: Tue Feb 28 19:54:59 2017 -0500 -- CHANGES.txt | 1 + build.xml | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/760d6c33/CHANGES.txt -- diff --cc CHANGES.txt index 1cced71,a63bd12..497f5c4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,4 +1,15 @@@ -3.0.12 +3.11.0 + * Fix equality comparisons of columns using the duration type (CASSANDRA-13174) + * Obfuscate password in stress-graphs (CASSANDRA-12233) + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034) + * nodetool stopdaemon errors out (CASSANDRA-13030) + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954) + * Fix primary index calculation for SASI (CASSANDRA-12910) + * More fixes to the TokenAllocator (CASSANDRA-12990) + * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983) +Merged from 3.0: ++ * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232) + * Coalescing strategy sleeps too much (CASSANDRA-13090) * Faster StreamingHistogram (CASSANDRA-13038) * Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237) * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070) http://git-wip-us.apache.org/repos/asf/cassandra/blob/760d6c33/build.xml -- diff --cc build.xml index 0eef700,69b6bdf..dcaa780 --- a/build.xml +++ b/build.xml @@@ -156,12 -153,14 +156,14 @@@ - - - + + ++ - - - + + ++
cassandra git commit: Merge branch 'cassandra-13317-3.11' into HEAD
Repository: cassandra Updated Branches: refs/heads/cassandra-13317-3.11 [created] cbb20cd35 refs/heads/cassandra-13317-trunk [created] cb02a7255 Merge branch 'cassandra-13317-3.11' into HEAD Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb02a725 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb02a725 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb02a725 Branch: refs/heads/cassandra-13317-trunk Commit: cb02a7255988ed4511b2ffc7a4daf09ce9d2447e Parents: 6a8f150 cbb20cd Author: Ariel Weisberg Authored: Thu Mar 23 10:47:15 2017 -0400 Committer: Ariel Weisberg Committed: Thu Mar 23 10:47:15 2017 -0400 -- CHANGES.txt| 2 ++ test/conf/logback-test.xml | 1 + 2 files changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb02a725/CHANGES.txt -- diff --cc CHANGES.txt index 6897fb0,2af351c..5be5c61 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,50 -1,5 +1,52 @@@ +4.0 + * Upgrade junit from 4.6 to 4.12 (CASSANDRA-13360) + * Cleanup ParentRepairSession after repairs (CASSANDRA-13359) + * Incremental repair not streaming correct sstables (CASSANDRA-13328) + * Upgrade the jna version to 4.3.0 (CASSANDRA-13300) + * Add the currentTimestamp, currentDate, currentTime and currentTimeUUID functions (CASSANDRA-13132) + * Remove config option index_interval (CASSANDRA-10671) + * Reduce lock contention for collection types and serializers (CASSANDRA-13271) + * Make it possible to override MessagingService.Verb ids (CASSANDRA-13283) + * Avoid synchronized on prepareForRepair in ActiveRepairService (CASSANDRA-9292) + * Adds the ability to use uncompressed chunks in compressed files (CASSANDRA-10520) + * Don't flush sstables when streaming for incremental repair (CASSANDRA-13226) + * Remove unused method (CASSANDRA-13227) + * Fix minor bugs related to #9143 (CASSANDRA-13217) + * Output warning if user increases RF (CASSANDRA-13079) + * Remove pre-3.0 streaming compatibility code for 4.0 (CASSANDRA-13081) + * Add support for + and - operations on dates (CASSANDRA-11936) + * Fix consistency of incrementally repaired data (CASSANDRA-9143) + * Increase commitlog version (CASSANDRA-13161) + * Make TableMetadata immutable, optimize Schema (CASSANDRA-9425) + * Refactor ColumnCondition (CASSANDRA-12981) + * Parallelize streaming of different keyspaces (CASSANDRA-4663) + * Improved compactions metrics (CASSANDRA-13015) + * Speed-up start-up sequence by avoiding un-needed flushes (CASSANDRA-13031) + * Use Caffeine (W-TinyLFU) for on-heap caches (CASSANDRA-10855) + * Thrift removal (CASSANDRA-5) + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716) + * Add column definition kind to dropped columns in schema (CASSANDRA-12705) + * Add (automate) Nodetool Documentation (CASSANDRA-12672) + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736) + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681) + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422) + * Use new token allocation for non bootstrap case as well (CASSANDRA-13080) + * Avoid byte-array copy when key cache is disabled (CASSANDRA-13084) + * Require forceful decommission if number of nodes is less than replication factor (CASSANDRA-12510) + * Allow IN restrictions on column families with collections (CASSANDRA-12654) + * Log message size in trace message in OutboundTcpConnection (CASSANDRA-13028) + * Add timeUnit Days for cassandra-stress (CASSANDRA-13029) + * Add mutation size and batch metrics (CASSANDRA-12649) + * Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999) + * Expose time spent waiting in thread pool queue (CASSANDRA-8398) + * Conditionally update index built status to avoid unnecessary flushes (CASSANDRA-12969) + * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946) + * Add support for arithmetic operators (CASSANDRA-11935) + * Add histogram for delay to deliver hints (CASSANDRA-13234) + + + 3.11.1 + * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern (CASSANDRA-13317) 3.11.0 * Possible AssertionError in UnfilteredRowIteratorWithLowerBound (CASSANDRA-13366) * Support unaligned memory access for AArch64 (CASSANDRA-13326)
[cassandra] Git Push Summary
Repository: cassandra Updated Branches: refs/heads/cassandra-13317-trunk [deleted] cb02a7255
[cassandra] Git Push Summary
Repository: cassandra Updated Branches: refs/heads/cassandra-13317-3.11 [deleted] cbb20cd35
[1/3] cassandra git commit: Set true in test/conf/logback-test.xml Patch my Michael Kjellman; Reviewed by Ariel Weisberg for CASSANDRA-13317
Repository: cassandra Updated Branches: refs/heads/cassandra-3.11 f55cb88ab -> 3e95c5b0c refs/heads/trunk 6a8f15031 -> 66cd42ef6 Set true in test/conf/logback-test.xml Patch my Michael Kjellman; Reviewed by Ariel Weisberg for CASSANDRA-13317 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e95c5b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e95c5b0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e95c5b0 Branch: refs/heads/cassandra-3.11 Commit: 3e95c5b0c574383e7da9a5e152b7be8aa122af9f Parents: f55cb88 Author: Ariel Weisberg Authored: Wed Mar 22 15:37:16 2017 -0400 Committer: Ariel Weisberg Committed: Thu Mar 23 11:31:47 2017 -0400 -- CHANGES.txt| 1 + test/conf/logback-test.xml | 1 + 2 files changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e95c5b0/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index f4e48ff..c58fad8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.11.0 + * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern (CASSANDRA-13317) * Possible AssertionError in UnfilteredRowIteratorWithLowerBound (CASSANDRA-13366) * Support unaligned memory access for AArch64 (CASSANDRA-13326) * Improve SASI range iterator efficiency on intersection with an empty range (CASSANDRA-12915). http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e95c5b0/test/conf/logback-test.xml -- diff --git a/test/conf/logback-test.xml b/test/conf/logback-test.xml index addce22..48f93bc 100644 --- a/test/conf/logback-test.xml +++ b/test/conf/logback-test.xml @@ -68,6 +68,7 @@ 0 1024 + true
[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Merge branch 'cassandra-3.11' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66cd42ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66cd42ef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66cd42ef Branch: refs/heads/trunk Commit: 66cd42ef615324e060004610dfad4ca1d4488f68 Parents: 6a8f150 3e95c5b Author: Ariel Weisberg Authored: Thu Mar 23 11:33:27 2017 -0400 Committer: Ariel Weisberg Committed: Thu Mar 23 11:33:27 2017 -0400 -- CHANGES.txt| 1 + test/conf/logback-test.xml | 1 + 2 files changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/66cd42ef/CHANGES.txt -- diff --cc CHANGES.txt index 6897fb0,c58fad8..906ea64 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,51 -1,5 +1,52 @@@ +4.0 + * Upgrade junit from 4.6 to 4.12 (CASSANDRA-13360) + * Cleanup ParentRepairSession after repairs (CASSANDRA-13359) + * Incremental repair not streaming correct sstables (CASSANDRA-13328) + * Upgrade the jna version to 4.3.0 (CASSANDRA-13300) + * Add the currentTimestamp, currentDate, currentTime and currentTimeUUID functions (CASSANDRA-13132) + * Remove config option index_interval (CASSANDRA-10671) + * Reduce lock contention for collection types and serializers (CASSANDRA-13271) + * Make it possible to override MessagingService.Verb ids (CASSANDRA-13283) + * Avoid synchronized on prepareForRepair in ActiveRepairService (CASSANDRA-9292) + * Adds the ability to use uncompressed chunks in compressed files (CASSANDRA-10520) + * Don't flush sstables when streaming for incremental repair (CASSANDRA-13226) + * Remove unused method (CASSANDRA-13227) + * Fix minor bugs related to #9143 (CASSANDRA-13217) + * Output warning if user increases RF (CASSANDRA-13079) + * Remove pre-3.0 streaming compatibility code for 4.0 (CASSANDRA-13081) + * Add support for + and - operations on dates (CASSANDRA-11936) + * Fix consistency of incrementally repaired data (CASSANDRA-9143) + * Increase commitlog version (CASSANDRA-13161) + * Make TableMetadata immutable, optimize Schema (CASSANDRA-9425) + * Refactor ColumnCondition (CASSANDRA-12981) + * Parallelize streaming of different keyspaces (CASSANDRA-4663) + * Improved compactions metrics (CASSANDRA-13015) + * Speed-up start-up sequence by avoiding un-needed flushes (CASSANDRA-13031) + * Use Caffeine (W-TinyLFU) for on-heap caches (CASSANDRA-10855) + * Thrift removal (CASSANDRA-5) + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716) + * Add column definition kind to dropped columns in schema (CASSANDRA-12705) + * Add (automate) Nodetool Documentation (CASSANDRA-12672) + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736) + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681) + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422) + * Use new token allocation for non bootstrap case as well (CASSANDRA-13080) + * Avoid byte-array copy when key cache is disabled (CASSANDRA-13084) + * Require forceful decommission if number of nodes is less than replication factor (CASSANDRA-12510) + * Allow IN restrictions on column families with collections (CASSANDRA-12654) + * Log message size in trace message in OutboundTcpConnection (CASSANDRA-13028) + * Add timeUnit Days for cassandra-stress (CASSANDRA-13029) + * Add mutation size and batch metrics (CASSANDRA-12649) + * Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999) + * Expose time spent waiting in thread pool queue (CASSANDRA-8398) + * Conditionally update index built status to avoid unnecessary flushes (CASSANDRA-12969) + * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946) + * Add support for arithmetic operators (CASSANDRA-11935) + * Add histogram for delay to deliver hints (CASSANDRA-13234) + + 3.11.0 + * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern (CASSANDRA-13317) * Possible AssertionError in UnfilteredRowIteratorWithLowerBound (CASSANDRA-13366) * Support unaligned memory access for AArch64 (CASSANDRA-13326) * Improve SASI range iterator efficiency on intersection with an empty range (CASSANDRA-12915).
[2/3] cassandra git commit: Set true in test/conf/logback-test.xml Patch my Michael Kjellman; Reviewed by Ariel Weisberg for CASSANDRA-13317
Set true in test/conf/logback-test.xml Patch my Michael Kjellman; Reviewed by Ariel Weisberg for CASSANDRA-13317 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e95c5b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e95c5b0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e95c5b0 Branch: refs/heads/trunk Commit: 3e95c5b0c574383e7da9a5e152b7be8aa122af9f Parents: f55cb88 Author: Ariel Weisberg Authored: Wed Mar 22 15:37:16 2017 -0400 Committer: Ariel Weisberg Committed: Thu Mar 23 11:31:47 2017 -0400 -- CHANGES.txt| 1 + test/conf/logback-test.xml | 1 + 2 files changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e95c5b0/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index f4e48ff..c58fad8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.11.0 + * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern (CASSANDRA-13317) * Possible AssertionError in UnfilteredRowIteratorWithLowerBound (CASSANDRA-13366) * Support unaligned memory access for AArch64 (CASSANDRA-13326) * Improve SASI range iterator efficiency on intersection with an empty range (CASSANDRA-12915). http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e95c5b0/test/conf/logback-test.xml -- diff --git a/test/conf/logback-test.xml b/test/conf/logback-test.xml index addce22..48f93bc 100644 --- a/test/conf/logback-test.xml +++ b/test/conf/logback-test.xml @@ -68,6 +68,7 @@ 0 1024 + true
[2/3] cassandra git commit: Avoid seeding /dev/urandom on OS X by specifying SHA1PRNG in CipherFactoryTest.
Avoid seeding /dev/urandom on OS X by specifying SHA1PRNG in CipherFactoryTest.
Patch by Jay Zhuang; Reviewed by Ariel Weisberg for CASSANDRA-13370
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee7023e3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee7023e3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee7023e3
Branch: refs/heads/trunk
Commit: ee7023e324cdd3b3442b04ad4b0b1f4b33921d35
Parents: a10b807
Author: Jay Zhuang
Authored: Fri Mar 24 13:08:50 2017 -0400
Committer: Ariel Weisberg
Committed: Fri Mar 24 13:08:50 2017 -0400
--
CHANGES.txt| 1 +
.../cassandra/security/CipherFactoryTest.java | 17 -
2 files changed, 17 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee7023e3/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 8b13109..071dd1a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.11.0
+ * unittest CipherFactoryTest failed on MacOS (CASSANDRA-13370)
* Forbid SELECT restrictions and CREATE INDEX over non-frozen UDT columns
(CASSANDRA-13247)
* Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern
(CASSANDRA-13317)
* Possible AssertionError in UnfilteredRowIteratorWithLowerBound
(CASSANDRA-13366)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee7023e3/test/unit/org/apache/cassandra/security/CipherFactoryTest.java
--
diff --git a/test/unit/org/apache/cassandra/security/CipherFactoryTest.java
b/test/unit/org/apache/cassandra/security/CipherFactoryTest.java
index 4ba265e..29302b7 100644
--- a/test/unit/org/apache/cassandra/security/CipherFactoryTest.java
+++ b/test/unit/org/apache/cassandra/security/CipherFactoryTest.java
@@ -21,6 +21,7 @@
package org.apache.cassandra.security;
import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import javax.crypto.BadPaddingException;
@@ -34,6 +35,9 @@ import org.junit.Test;
import org.apache.cassandra.config.TransparentDataEncryptionOptions;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
public class CipherFactoryTest
{
// http://www.gutenberg.org/files/4300/4300-h/4300-h.htm
@@ -47,7 +51,18 @@ public class CipherFactoryTest
@Before
public void setup()
{
-secureRandom = new SecureRandom(new byte[] {0,1,2,3,4,5,6,7,8,9} );
+try
+{
+secureRandom = SecureRandom.getInstance("SHA1PRNG");
+assertNotNull(secureRandom.getProvider());
+}
+catch (NoSuchAlgorithmException e)
+{
+fail("NoSuchAlgorithmException: SHA1PRNG not found.");
+}
+long seed = new java.util.Random().nextLong();
+System.out.println("Seed: " + seed);
+secureRandom.setSeed(seed);
encryptionOptions =
EncryptionContextGenerator.createEncryptionOptions();
cipherFactory = new CipherFactory(encryptionOptions);
}
[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Merge branch 'cassandra-3.11' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60e2e982 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60e2e982 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60e2e982 Branch: refs/heads/trunk Commit: 60e2e982656e9ba495107ffe8f338223e1196b4a Parents: 3048608 ee7023e Author: Ariel Weisberg Authored: Fri Mar 24 13:12:05 2017 -0400 Committer: Ariel Weisberg Committed: Fri Mar 24 13:12:05 2017 -0400 -- CHANGES.txt| 1 + .../cassandra/security/CipherFactoryTest.java | 17 - 2 files changed, 17 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/60e2e982/CHANGES.txt -- diff --cc CHANGES.txt index 1eab15b,071dd1a..fb9b8c4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,51 -1,5 +1,52 @@@ +4.0 + * Upgrade junit from 4.6 to 4.12 (CASSANDRA-13360) + * Cleanup ParentRepairSession after repairs (CASSANDRA-13359) + * Incremental repair not streaming correct sstables (CASSANDRA-13328) + * Upgrade the jna version to 4.3.0 (CASSANDRA-13300) + * Add the currentTimestamp, currentDate, currentTime and currentTimeUUID functions (CASSANDRA-13132) + * Remove config option index_interval (CASSANDRA-10671) + * Reduce lock contention for collection types and serializers (CASSANDRA-13271) + * Make it possible to override MessagingService.Verb ids (CASSANDRA-13283) + * Avoid synchronized on prepareForRepair in ActiveRepairService (CASSANDRA-9292) + * Adds the ability to use uncompressed chunks in compressed files (CASSANDRA-10520) + * Don't flush sstables when streaming for incremental repair (CASSANDRA-13226) + * Remove unused method (CASSANDRA-13227) + * Fix minor bugs related to #9143 (CASSANDRA-13217) + * Output warning if user increases RF (CASSANDRA-13079) + * Remove pre-3.0 streaming compatibility code for 4.0 (CASSANDRA-13081) + * Add support for + and - operations on dates (CASSANDRA-11936) + * Fix consistency of incrementally repaired data (CASSANDRA-9143) + * Increase commitlog version (CASSANDRA-13161) + * Make TableMetadata immutable, optimize Schema (CASSANDRA-9425) + * Refactor ColumnCondition (CASSANDRA-12981) + * Parallelize streaming of different keyspaces (CASSANDRA-4663) + * Improved compactions metrics (CASSANDRA-13015) + * Speed-up start-up sequence by avoiding un-needed flushes (CASSANDRA-13031) + * Use Caffeine (W-TinyLFU) for on-heap caches (CASSANDRA-10855) + * Thrift removal (CASSANDRA-5) + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716) + * Add column definition kind to dropped columns in schema (CASSANDRA-12705) + * Add (automate) Nodetool Documentation (CASSANDRA-12672) + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736) + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681) + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422) + * Use new token allocation for non bootstrap case as well (CASSANDRA-13080) + * Avoid byte-array copy when key cache is disabled (CASSANDRA-13084) + * Require forceful decommission if number of nodes is less than replication factor (CASSANDRA-12510) + * Allow IN restrictions on column families with collections (CASSANDRA-12654) + * Log message size in trace message in OutboundTcpConnection (CASSANDRA-13028) + * Add timeUnit Days for cassandra-stress (CASSANDRA-13029) + * Add mutation size and batch metrics (CASSANDRA-12649) + * Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999) + * Expose time spent waiting in thread pool queue (CASSANDRA-8398) + * Conditionally update index built status to avoid unnecessary flushes (CASSANDRA-12969) + * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946) + * Add support for arithmetic operators (CASSANDRA-11935) + * Add histogram for delay to deliver hints (CASSANDRA-13234) + + 3.11.0 + * unittest CipherFactoryTest failed on MacOS (CASSANDRA-13370) * Forbid SELECT restrictions and CREATE INDEX over non-frozen UDT columns (CASSANDRA-13247) * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern (CASSANDRA-13317) * Possible AssertionError in UnfilteredRowIteratorWithLowerBound (CASSANDRA-13366)
[1/3] cassandra git commit: Avoid seeding /dev/urandom on OS X by specifying SHA1PRNG in CipherFactoryTest.
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 a10b8079e -> ee7023e32
refs/heads/trunk 3048608c6 -> 60e2e9826
Avoid seeding /dev/urandom on OS X by specifying SHA1PRNG in CipherFactoryTest.
Patch by Jay Zhuang; Reviewed by Ariel Weisberg for CASSANDRA-13370
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee7023e3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee7023e3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee7023e3
Branch: refs/heads/cassandra-3.11
Commit: ee7023e324cdd3b3442b04ad4b0b1f4b33921d35
Parents: a10b807
Author: Jay Zhuang
Authored: Fri Mar 24 13:08:50 2017 -0400
Committer: Ariel Weisberg
Committed: Fri Mar 24 13:08:50 2017 -0400
--
CHANGES.txt| 1 +
.../cassandra/security/CipherFactoryTest.java | 17 -
2 files changed, 17 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee7023e3/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 8b13109..071dd1a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.11.0
+ * unittest CipherFactoryTest failed on MacOS (CASSANDRA-13370)
* Forbid SELECT restrictions and CREATE INDEX over non-frozen UDT columns
(CASSANDRA-13247)
* Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern
(CASSANDRA-13317)
* Possible AssertionError in UnfilteredRowIteratorWithLowerBound
(CASSANDRA-13366)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee7023e3/test/unit/org/apache/cassandra/security/CipherFactoryTest.java
--
diff --git a/test/unit/org/apache/cassandra/security/CipherFactoryTest.java
b/test/unit/org/apache/cassandra/security/CipherFactoryTest.java
index 4ba265e..29302b7 100644
--- a/test/unit/org/apache/cassandra/security/CipherFactoryTest.java
+++ b/test/unit/org/apache/cassandra/security/CipherFactoryTest.java
@@ -21,6 +21,7 @@
package org.apache.cassandra.security;
import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import javax.crypto.BadPaddingException;
@@ -34,6 +35,9 @@ import org.junit.Test;
import org.apache.cassandra.config.TransparentDataEncryptionOptions;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
public class CipherFactoryTest
{
// http://www.gutenberg.org/files/4300/4300-h/4300-h.htm
@@ -47,7 +51,18 @@ public class CipherFactoryTest
@Before
public void setup()
{
-secureRandom = new SecureRandom(new byte[] {0,1,2,3,4,5,6,7,8,9} );
+try
+{
+secureRandom = SecureRandom.getInstance("SHA1PRNG");
+assertNotNull(secureRandom.getProvider());
+}
+catch (NoSuchAlgorithmException e)
+{
+fail("NoSuchAlgorithmException: SHA1PRNG not found.");
+}
+long seed = new java.util.Random().nextLong();
+System.out.println("Seed: " + seed);
+secureRandom.setSeed(seed);
encryptionOptions =
EncryptionContextGenerator.createEncryptionOptions();
cipherFactory = new CipherFactory(encryptionOptions);
}
cassandra git commit: Outbound TCP connections should consult internode authenticator. Patch by Ariel Weisberg; Reviewed by Marcus Eriksson for CASSANDRA-13324
Repository: cassandra
Updated Branches:
refs/heads/trunk 60e2e9826 -> 732d1af86
Outbound TCP connections should consult internode authenticator.
Patch by Ariel Weisberg; Reviewed by Marcus Eriksson for CASSANDRA-13324
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/732d1af8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/732d1af8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/732d1af8
Branch: refs/heads/trunk
Commit: 732d1af866b91e5ba63e7e2a467d99d4cb90e11f
Parents: 60e2e98
Author: Ariel Weisberg
Authored: Fri Mar 24 15:26:50 2017 -0400
Committer: Ariel Weisberg
Committed: Fri Mar 24 15:26:50 2017 -0400
--
CHANGES.txt | 1 +
.../org/apache/cassandra/auth/AuthConfig.java | 10 +---
.../cassandra/config/DatabaseDescriptor.java| 5 +-
.../locator/ReconnectableSnitchHelper.java | 21 +--
.../apache/cassandra/net/MessagingService.java | 44 --
.../cassandra/net/OutboundTcpConnection.java| 33 +++---
.../net/OutboundTcpConnectionPool.java | 9 ++-
.../config/DatabaseDescriptorRefTest.java | 1 +
.../locator/ReconnectableSnitchHelperTest.java | 63
.../cassandra/net/MessagingServiceTest.java | 60 +++
10 files changed, 218 insertions(+), 29 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/732d1af8/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index fb9b8c4..b42bde6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
4.0
+ * Outbound TCP connections ignore internode authenticator (CASSANDRA-13324)
* Upgrade junit from 4.6 to 4.12 (CASSANDRA-13360)
* Cleanup ParentRepairSession after repairs (CASSANDRA-13359)
* Incremental repair not streaming correct sstables (CASSANDRA-13328)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/732d1af8/src/java/org/apache/cassandra/auth/AuthConfig.java
--
diff --git a/src/java/org/apache/cassandra/auth/AuthConfig.java
b/src/java/org/apache/cassandra/auth/AuthConfig.java
index c389ae4..2ca1522 100644
--- a/src/java/org/apache/cassandra/auth/AuthConfig.java
+++ b/src/java/org/apache/cassandra/auth/AuthConfig.java
@@ -25,6 +25,7 @@ import org.apache.cassandra.config.Config;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.utils.FBUtilities;
+import org.hsqldb.Database;
/**
* Only purpose is to Initialize authentication/authorization via {@link
#applyAuth()}.
@@ -94,13 +95,8 @@ public final class AuthConfig
// authenticator
-IInternodeAuthenticator internodeAuthenticator;
if (conf.internode_authenticator != null)
-internodeAuthenticator =
FBUtilities.construct(conf.internode_authenticator, "internode_authenticator");
-else
-internodeAuthenticator = new AllowAllInternodeAuthenticator();
-
-DatabaseDescriptor.setInternodeAuthenticator(internodeAuthenticator);
+
DatabaseDescriptor.setInternodeAuthenticator(FBUtilities.construct(conf.internode_authenticator,
"internode_authenticator"));
// Validate at last to have authenticator, authorizer, role-manager
and internode-auth setup
// in case these rely on each other.
@@ -108,6 +104,6 @@ public final class AuthConfig
authenticator.validateConfiguration();
authorizer.validateConfiguration();
roleManager.validateConfiguration();
-internodeAuthenticator.validateConfiguration();
+DatabaseDescriptor.getInternodeAuthenticator().validateConfiguration();
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/732d1af8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 4fb742c..465cd8a 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -29,6 +29,7 @@ import java.nio.file.Paths;
import java.util.*;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import com.google.common.primitives.Ints;
import com.google.common.primitives.Longs;
@@ -36,6 +37,7 @@ import com.google.common.primitives.Longs;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.cassandra.auth.AllowAllInternodeAuthenticator;
imp
cassandra git commit: Fix NPEs in original CASSANDRA-13324 commit
Repository: cassandra
Updated Branches:
refs/heads/trunk 3dabeeaa2 -> c86de2a98
Fix NPEs in original CASSANDRA-13324 commit
Patch by Ariel Weisberg; Reviewed by Marcus Eriksson
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c86de2a9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c86de2a9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c86de2a9
Branch: refs/heads/trunk
Commit: c86de2a9817aa45930afe181ae1891d2363393c7
Parents: 3dabeea
Author: Ariel Weisberg
Authored: Fri Mar 24 17:48:24 2017 -0400
Committer: Ariel Weisberg
Committed: Mon Mar 27 13:24:36 2017 -0400
--
.../apache/cassandra/net/MessagingService.java | 40 +---
1 file changed, 26 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c86de2a9/src/java/org/apache/cassandra/net/MessagingService.java
--
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java
b/src/java/org/apache/cassandra/net/MessagingService.java
index 55604d0..b7d4329 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -536,8 +536,6 @@ public final class MessagingService implements
MessagingServiceMBean
if (cp != null)
cp.incrementTimeout();
-
getConnectionPool(expiredCallbackInfo.target).incrementTimeout();
-
if (expiredCallbackInfo.callback.supportsBackPressure())
{
updateBackPressureOnReceive(expiredCallbackInfo.target,
expiredCallbackInfo.callback, true);
@@ -607,8 +605,12 @@ public final class MessagingService implements
MessagingServiceMBean
{
if (DatabaseDescriptor.backPressureEnabled() &&
callback.supportsBackPressure())
{
-BackPressureState backPressureState =
getConnectionPool(host).getBackPressureState();
-backPressureState.onMessageSent(message);
+OutboundTcpConnectionPool cp = getConnectionPool(host);
+if (cp != null)
+{
+BackPressureState backPressureState =
cp.getBackPressureState();
+backPressureState.onMessageSent(message);
+}
}
}
@@ -623,11 +625,15 @@ public final class MessagingService implements
MessagingServiceMBean
{
if (DatabaseDescriptor.backPressureEnabled() &&
callback.supportsBackPressure())
{
-BackPressureState backPressureState =
getConnectionPool(host).getBackPressureState();
-if (!timeout)
-backPressureState.onResponseReceived();
-else
-backPressureState.onResponseTimeout();
+OutboundTcpConnectionPool cp = getConnectionPool(host);
+if (cp != null)
+{
+BackPressureState backPressureState =
cp.getBackPressureState();
+if (!timeout)
+backPressureState.onResponseReceived();
+else
+backPressureState.onResponseTimeout();
+}
}
}
@@ -644,10 +650,16 @@ public final class MessagingService implements
MessagingServiceMBean
{
if (DatabaseDescriptor.backPressureEnabled())
{
-backPressure.apply(StreamSupport.stream(hosts.spliterator(), false)
-.filter(h -> !h.equals(FBUtilities.getBroadcastAddress()))
-.map(h -> getConnectionPool(h).getBackPressureState())
-.collect(Collectors.toSet()), timeoutInNanos,
TimeUnit.NANOSECONDS);
+Set states = new HashSet();
+for (InetAddress host : hosts)
+{
+if (host.equals(FBUtilities.getBroadcastAddress()))
+continue;
+OutboundTcpConnectionPool cp = getConnectionPool(host);
+if (cp != null)
+states.add(cp.getBackPressureState());
+}
+backPressure.apply(states, timeoutInNanos, TimeUnit.NANOSECONDS);
}
}
@@ -679,7 +691,7 @@ public final class MessagingService implements
MessagingServiceMBean
if (cp != null)
{
logger.trace("Resetting pool for {}", ep);
-getConnectionPool(ep).reset();
+cp.reset();
}
else
{
cassandra git commit: Make it possible to monitor an ideal consistency level separate from actual consistency level
Repository: cassandra Updated Branches: refs/heads/trunk bb4c5c3c4 -> 6f647aaa0 Make it possible to monitor an ideal consistency level separate from actual consistency level Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13289 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6f647aaa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f647aaa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f647aaa Branch: refs/heads/trunk Commit: 6f647aaa0df6f90ee298d372e624c9e3c1ae937e Parents: bb4c5c3 Author: Ariel Weisberg Authored: Thu Mar 2 16:46:13 2017 -0500 Committer: Ariel Weisberg Committed: Thu Mar 30 17:01:20 2017 -0400 -- CHANGES.txt | 1 + conf/cassandra.yaml | 5 + .../org/apache/cassandra/config/Config.java | 8 + .../cassandra/config/DatabaseDescriptor.java| 11 + .../locator/AbstractReplicationStrategy.java| 49 +++- .../cassandra/metrics/KeyspaceMetrics.java | 9 + .../service/AbstractWriteResponseHandler.java | 105 - .../DatacenterSyncWriteResponseHandler.java | 30 ++- .../service/DatacenterWriteResponseHandler.java | 8 + .../apache/cassandra/service/StorageProxy.java | 26 ++- .../cassandra/service/StorageProxyMBean.java| 5 + .../cassandra/service/WriteResponseHandler.java | 4 + .../config/DatabaseDescriptorRefTest.java | 1 + .../service/WriteResponseHandlerTest.java | 234 +++ 14 files changed, 474 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f647aaa/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 6a164ee..d4b53d0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * Make it possible to monitor an ideal consistency level separate from actual consistency level (CASSANDRA-13289) * Outbound TCP connections ignore internode authenticator (CASSANDRA-13324) * Upgrade junit from 4.6 to 4.12 (CASSANDRA-13360) * Cleanup ParentRepairSession after repairs (CASSANDRA-13359) http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f647aaa/conf/cassandra.yaml -- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index d8392a0..f2c4c84 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -1120,3 +1120,8 @@ back_pressure_strategy: # Do not try to coalesce messages if we already got that many messages. This should be more than 2 and less than 128. # otc_coalescing_enough_coalesced_messages: 8 + +# Track a metric per keyspace indicating whether replication achieved the ideal consistency +# level for writes without timing out. This is different from the consistency level requested by +# each write which may be lower in order to facilitate availability. +# ideal_consistency_level: EACH_QUORUM http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f647aaa/src/java/org/apache/cassandra/config/Config.java -- diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java index 36ce576..1461cd4 100644 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@ -32,6 +32,8 @@ import com.google.common.collect.Sets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.cassandra.db.ConsistencyLevel; + /** * A class that contains configuration properties for the cassandra node it runs within. * @@ -271,6 +273,12 @@ public class Config public int tracetype_query_ttl = (int) TimeUnit.DAYS.toSeconds(1); public int tracetype_repair_ttl = (int) TimeUnit.DAYS.toSeconds(7); +/** + * Maintain statistics on whether writes achieve the ideal consistency level + * before expiring and becoming hints + */ +public volatile ConsistencyLevel ideal_consistency_level = null; + /* * Strategy to use for coalescing messages in OutboundTcpConnection. * Can be fixed, movingaverage, timehorizon, disabled. Setting is case and leading/trailing http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f647aaa/src/java/org/apache/cassandra/config/DatabaseDescriptor.java -- diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 465cd8a..debf161 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -44,6 +44,7 @@ import org.apac
cassandra git commit: Add additional statistics for speculative retry.
Repository: cassandra
Updated Branches:
refs/heads/trunk ab7aa57b3 -> 2c6924b56
Add additional statistics for speculative retry.
Patch by Ariel Weisberg; Reviewed by Blake Eggleston for CASSANDRA-13373
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2c6924b5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2c6924b5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2c6924b5
Branch: refs/heads/trunk
Commit: 2c6924b561ddf0b0df9315946b21260d6e27fdb9
Parents: ab7aa57
Author: Ariel Weisberg
Authored: Thu Mar 23 19:25:54 2017 -0400
Committer: Ariel Weisberg
Committed: Mon Apr 3 18:24:02 2017 -0400
--
doc/source/operating/metrics.rst| 3 +
.../cassandra/metrics/KeyspaceMetrics.java | 52 +
.../apache/cassandra/metrics/TableMetrics.java | 12 ++
.../cassandra/service/AbstractReadExecutor.java | 102 ++---
.../apache/cassandra/service/ReadCallback.java | 2 +-
.../cassandra/service/ReadExecutorTest.java | 215 +++
6 files changed, 360 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2c6924b5/doc/source/operating/metrics.rst
--
diff --git a/doc/source/operating/metrics.rst b/doc/source/operating/metrics.rst
index af2e36e..6e1b212 100644
--- a/doc/source/operating/metrics.rst
+++ b/doc/source/operating/metrics.rst
@@ -127,6 +127,9 @@ CasPropose Latency
Latency of paxos propose
CasCommit LatencyLatency of paxos commit
round.
PercentRepaired Gauge Percent of table data
that is repaired on disk.
SpeculativeRetries CounterNumber of times
speculative retries were sent for this table.
+SpeculativeFailedRetriesCounterNumber of speculative
retries that failed to prevent a timeout
+SpeculativeInsufficientReplicas CounterNumber of speculative
retries that couldn't be attempted due to lack of replicas
+SpeculativeSampleLatencyNanos GaugeNumber of nanoseconds
to wait before speculation is attempted. Value may be statically configured or
updated periodically based on coordinator latency.
WaitingOnFreeMemtableSpace Histogram Histogram of time spent
waiting for free memtable space, either on- or off-heap.
DroppedMutationsCounterNumber of dropped
mutations on this table.
=== == ===
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2c6924b5/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
--
diff --git a/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
b/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
index 63f8dd0..3c6b604 100644
--- a/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
@@ -97,6 +97,12 @@ public class KeyspaceMetrics
public final Counter writeFailedIdealCL;
/** Ideal CL write latency metrics */
public final LatencyMetrics idealCLWriteLatency;
+/** Speculative retries **/
+public final Counter speculativeRetries;
+/** Speculative retry occured but still timed out **/
+public final Counter speculativeFailedRetries;
+/** Needed to speculate, but didn't have enough replicas **/
+public final Counter speculativeInsufficientReplicas;
public final MetricNameFactory factory;
private Keyspace keyspace;
@@ -244,6 +250,28 @@ public class KeyspaceMetrics
casCommit = new LatencyMetrics(factory, "CasCommit");
writeFailedIdealCL =
Metrics.counter(factory.createMetricName("WriteFailedIdealCL"));
idealCLWriteLatency = new LatencyMetrics(factory, "IdealCLWrite");
+
+speculativeRetries = createKeyspaceCounter("SpeculativeRetries", new
MetricValue()
+{
+public Long getValue(TableMetrics metric)
+{
+return metric.speculativeRetries.getCount();
+}
+});
+speculativeFailedRetries =
createKeyspaceCounter("SpeculativeFailedRetries", new MetricValue()
+{
+public Long getValue(TableMetrics metric)
+{
+return metric.speculativeFailedRetries.getCount();
+}
+});
+speculativeInsufficientReplicas =
createKeyspaceCounter("SpeculativeInsufficientReplicas", new MetricValue()
+{
+public Long getValue(TableMetrics metric)
+{
+return metric.speculativeInsufficientReplicas.getCount();
+
cassandra git commit: Add documentation for ideal consistency level metrics.
Repository: cassandra Updated Branches: refs/heads/trunk bce0aa180 -> 2ba06310d Add documentation for ideal consistency level metrics. Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13289 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ba06310 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ba06310 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ba06310 Branch: refs/heads/trunk Commit: 2ba06310daee2e4a84b1f9d78f8445f2951055b7 Parents: bce0aa1 Author: Ariel Weisberg Authored: Mon Apr 3 18:48:34 2017 -0400 Committer: Ariel Weisberg Committed: Tue Apr 4 19:34:27 2017 -0400 -- doc/source/operating/metrics.rst | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ba06310/doc/source/operating/metrics.rst -- diff --git a/doc/source/operating/metrics.rst b/doc/source/operating/metrics.rst index 6e1b212..dcf82bc 100644 --- a/doc/source/operating/metrics.rst +++ b/doc/source/operating/metrics.rst @@ -138,7 +138,7 @@ Keyspace Metrics Each keyspace in Cassandra has metrics responsible for tracking its state and performance. -These metrics are the same as the ``Table Metrics`` above, only they are aggregated at the Keyspace level. +Most of these metrics are the same as the ``Table Metrics`` above, only they are aggregated at the Keyspace level. The keyspace specific metrics are specified in the table below. Reported name format: @@ -148,6 +148,14 @@ Reported name format: **JMX MBean** ``org.apache.cassandra.metrics:type=Keyspace scope= name=`` + +=== == === +NameType Description +=== == === +WriteFailedIdeaCL CounterNumber of writes that failed to achieve the configured ideal consistency level or 0 if none is configured +IdealCLWriteLatency LatencyCoordinator latency of writes at the configured ideal consistency level. No values are recorded if ideal consistency level is not configured +=== == === + ThreadPool Metrics ^^
[2/3] cassandra git commit: Use write lock not read lock for removing sstables from compaction strategies.
Use write lock not read lock for removing sstables from compaction strategies.
Patch by Ariel Weisberg; Reviewed by Marcus Eriksson for CASSANDRA-13422
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c9751424
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9751424
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9751424
Branch: refs/heads/trunk
Commit: c97514243e8c58bdda0ebf75212a8a217f3d017e
Parents: 1a7b1ee
Author: Ariel Weisberg
Authored: Thu Apr 6 17:53:04 2017 -0400
Committer: Ariel Weisberg
Committed: Mon Apr 10 16:45:15 2017 -0700
--
CHANGES.txt | 1 +
.../cassandra/db/compaction/CompactionStrategyManager.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9751424/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a7b464a..7998e10 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.11.0
+ * Use write lock not read lock for removing sstables from compaction
strategies. (CASSANDRA-13422)
* Use corePoolSize equal to maxPoolSize in JMXEnabledThreadPoolExecutors
(CASSANDRA-13329)
* Avoid rebuilding SASI indexes containing no values (CASSANDRA-12962)
* Add charset to Analyser input stream (CASSANDRA-13151)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9751424/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
--
diff --git
a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
index 5679338..df89e53 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
@@ -531,14 +531,14 @@ public class CompactionStrategyManager implements
INotificationConsumer
private void handleDeletingNotification(SSTableReader deleted)
{
-readLock.lock();
+writeLock.lock();
try
{
getCompactionStrategyFor(deleted).removeSSTable(deleted);
}
finally
{
-readLock.unlock();
+writeLock.unlock();
}
}
[1/3] cassandra git commit: Use write lock not read lock for removing sstables from compaction strategies.
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 1a7b1ee4d -> c97514243
refs/heads/trunk aa65c6c54 -> f6f50129d
Use write lock not read lock for removing sstables from compaction strategies.
Patch by Ariel Weisberg; Reviewed by Marcus Eriksson for CASSANDRA-13422
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c9751424
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9751424
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9751424
Branch: refs/heads/cassandra-3.11
Commit: c97514243e8c58bdda0ebf75212a8a217f3d017e
Parents: 1a7b1ee
Author: Ariel Weisberg
Authored: Thu Apr 6 17:53:04 2017 -0400
Committer: Ariel Weisberg
Committed: Mon Apr 10 16:45:15 2017 -0700
--
CHANGES.txt | 1 +
.../cassandra/db/compaction/CompactionStrategyManager.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9751424/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a7b464a..7998e10 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.11.0
+ * Use write lock not read lock for removing sstables from compaction
strategies. (CASSANDRA-13422)
* Use corePoolSize equal to maxPoolSize in JMXEnabledThreadPoolExecutors
(CASSANDRA-13329)
* Avoid rebuilding SASI indexes containing no values (CASSANDRA-12962)
* Add charset to Analyser input stream (CASSANDRA-13151)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9751424/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
--
diff --git
a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
index 5679338..df89e53 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
@@ -531,14 +531,14 @@ public class CompactionStrategyManager implements
INotificationConsumer
private void handleDeletingNotification(SSTableReader deleted)
{
-readLock.lock();
+writeLock.lock();
try
{
getCompactionStrategyFor(deleted).removeSSTable(deleted);
}
finally
{
-readLock.unlock();
+writeLock.unlock();
}
}
