You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2015/07/23 17:13:38 UTC
[1/2] cassandra git commit: Warn on non-high perf power profile on
Windows
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 11ac93887 -> 165763903
Warn on non-high perf power profile on Windows
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-9648
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/53b64a40
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/53b64a40
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/53b64a40
Branch: refs/heads/cassandra-2.2
Commit: 53b64a406b02518fc7d88124de705c8cf2d7bd46
Parents: 11ac938
Author: Joshua McKenzie <jm...@apache.org>
Authored: Thu Jul 23 11:11:39 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Thu Jul 23 11:11:39 2015 -0400
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/53b64a40/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 8dddc2d..8b0b775 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -337,6 +337,26 @@ Function SetCassandraEnvironment
# Add sigar env - see Cassandra-7838
$env:JVM_OPTS = "$env:JVM_OPTS -Djava.library.path=$env:CASSANDRA_HOME\lib\sigar-bin"
+ # Confirm we're on high performance power plan, warn if not
+ # Change to $true to suppress this warning
+ $suppressPowerWarning = $false
+ if (!$suppressPowerWarning)
+ {
+ $currentProfile = powercfg /GETACTIVESCHEME
+ if (!$currentProfile.Contains("High performance"))
+ {
+ echo "*---------------------------------------------------------------------*"
+ echo "*---------------------------------------------------------------------*"
+ echo ""
+ echo " WARNING! Detected a power profile other than High Performance."
+ echo " Performance of this node will suffer."
+ echo " Modify conf\cassandra.env.ps1 to suppress this warning."
+ echo ""
+ echo "*---------------------------------------------------------------------*"
+ echo "*---------------------------------------------------------------------*"
+ }
+ }
+
# add the jamm javaagent
if (($env:JVM_VENDOR -ne "OpenJDK") -or ($env:JVM_VERSION.CompareTo("1.6.0") -eq 1) -or
(($env:JVM_VERSION -eq "1.6.0") -and ($env:JVM_PATCH_VERSION.CompareTo("22") -eq 1)))
[2/2] cassandra git commit: Skip testClearEphemeralSnapshots() on
Windows
Posted by jm...@apache.org.
Skip testClearEphemeralSnapshots() on Windows
Patch by jmckenzie; reviewed by tjake for CASSANDRA-9869
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/16576390
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16576390
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/16576390
Branch: refs/heads/cassandra-2.2
Commit: 16576390351abe987c236825523608ce79e6e91a
Parents: 53b64a4
Author: Joshua McKenzie <jm...@apache.org>
Authored: Thu Jul 23 11:12:28 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Thu Jul 23 11:12:28 2015 -0400
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16576390/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
index b5e62b3..5419ef5 100644
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
@@ -50,6 +50,7 @@ import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.io.sstable.format.SSTableWriter;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
+import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -1530,6 +1531,11 @@ public class ColumnFamilyStoreTest
@Test
public void testClearEphemeralSnapshots() throws Throwable
{
+ // We don't do snapshot-based repair on Windows so we don't have ephemeral snapshots from repair that need clearing.
+ // This test will fail as we'll revert to the WindowsFailedSnapshotTracker and counts will be off, but since we
+ // don't do snapshot-based repair on Windows, we just skip this test.
+ Assume.assumeTrue(!FBUtilities.isWindows());
+
ColumnFamilyStore cfs = Keyspace.open(KEYSPACE1).getColumnFamilyStore(CF_INDEX1);
//cleanup any previous test gargbage