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/10/19 21:13:27 UTC

[1/8] cassandra git commit: Make Windows -a startup skip VerifyPorts check entirely

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 3cd750012 -> 728f94e79
  refs/heads/cassandra-3.0 7159a754a -> fa909cc42
  refs/heads/trunk c0c513b64 -> a9060f033


Make Windows -a startup skip VerifyPorts check entirely

Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10524


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

Branch: refs/heads/cassandra-2.2
Commit: 728f94e798662bf8e0e4ad0f4d236394868cb7d6
Parents: 3cd7500
Author: Joshua McKenzie <jm...@apache.org>
Authored: Mon Oct 19 15:11:07 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Mon Oct 19 15:11:07 2015 -0400

----------------------------------------------------------------------
 bin/cassandra.ps1 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/728f94e7/bin/cassandra.ps1
----------------------------------------------------------------------
diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1
index 8cdd433..44ba9a4 100644
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@ -27,7 +27,7 @@ usage: cassandra.ps1 [-f] [-h] [-p pidfile] [-H dumpfile] [-D arg] [-E errorfile
     -E              change JVM ErrorFile
     -v              Print cassandra version and exit
     -s              Show detailed jvm environment information during launch
-    -a              Aggressive startup. Ignore ports that are TIME_WAIT for VerifyPorts check.
+    -a              Aggressive startup. Skip VerifyPorts check. For use in dev environments.
     -help           print this message
 
     NOTE: installing cassandra as a service requires Commons Daemon Service Runner
@@ -281,6 +281,10 @@ WARNING! Failed to write pidfile to $pidfile.  stop-server.bat and
 #-----------------------------------------------------------------------------
 Function VerifyPortsAreAvailable
 {
+    if ($a)
+    {
+        return
+    }
     # Need to confirm 5 different ports are available or die if any are currently bound
     # From cassandra.yaml:
     #   storage_port
@@ -308,10 +312,6 @@ Function VerifyPortsAreAvailable
     {
         if ($line -match "TCP" -and $line -match $portRegex)
         {
-            if ($a -and $line -match "TIME_WAIT")
-            {
-               continue
-            }
             Write-Error "Found a port already in use. Aborting startup"
             Write-Error $line
             Exit


[8/8] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

Posted by jm...@apache.org.
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: a9060f0335b4a7e4dd38b6ea012ae9d2c6f3d2a7
Parents: c0c513b fa909cc
Author: Joshua McKenzie <jm...@apache.org>
Authored: Mon Oct 19 15:12:57 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Mon Oct 19 15:12:57 2015 -0400

----------------------------------------------------------------------
 bin/cassandra.ps1      | 10 +++++-----
 conf/cassandra-env.ps1 |  5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------



[3/8] cassandra git commit: Make Windows -a startup skip VerifyPorts check entirely

Posted by jm...@apache.org.
Make Windows -a startup skip VerifyPorts check entirely

Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10524


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

Branch: refs/heads/trunk
Commit: 728f94e798662bf8e0e4ad0f4d236394868cb7d6
Parents: 3cd7500
Author: Joshua McKenzie <jm...@apache.org>
Authored: Mon Oct 19 15:11:07 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Mon Oct 19 15:11:07 2015 -0400

----------------------------------------------------------------------
 bin/cassandra.ps1 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/728f94e7/bin/cassandra.ps1
----------------------------------------------------------------------
diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1
index 8cdd433..44ba9a4 100644
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@ -27,7 +27,7 @@ usage: cassandra.ps1 [-f] [-h] [-p pidfile] [-H dumpfile] [-D arg] [-E errorfile
     -E              change JVM ErrorFile
     -v              Print cassandra version and exit
     -s              Show detailed jvm environment information during launch
-    -a              Aggressive startup. Ignore ports that are TIME_WAIT for VerifyPorts check.
+    -a              Aggressive startup. Skip VerifyPorts check. For use in dev environments.
     -help           print this message
 
     NOTE: installing cassandra as a service requires Commons Daemon Service Runner
@@ -281,6 +281,10 @@ WARNING! Failed to write pidfile to $pidfile.  stop-server.bat and
 #-----------------------------------------------------------------------------
 Function VerifyPortsAreAvailable
 {
+    if ($a)
+    {
+        return
+    }
     # Need to confirm 5 different ports are available or die if any are currently bound
     # From cassandra.yaml:
     #   storage_port
@@ -308,10 +312,6 @@ Function VerifyPortsAreAvailable
     {
         if ($line -match "TCP" -and $line -match $portRegex)
         {
-            if ($a -and $line -match "TIME_WAIT")
-            {
-               continue
-            }
             Write-Error "Found a port already in use. Aborting startup"
             Write-Error $line
             Exit


[5/8] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by jm...@apache.org.
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/f807b8c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f807b8c6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f807b8c6

Branch: refs/heads/trunk
Commit: f807b8c6ed1af297d29314399b9f250a966581f4
Parents: 7159a75 728f94e
Author: Joshua McKenzie <jm...@apache.org>
Authored: Mon Oct 19 15:11:43 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Mon Oct 19 15:11:43 2015 -0400

----------------------------------------------------------------------
 bin/cassandra.ps1 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------



[2/8] cassandra git commit: Make Windows -a startup skip VerifyPorts check entirely

Posted by jm...@apache.org.
Make Windows -a startup skip VerifyPorts check entirely

Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10524


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

Branch: refs/heads/cassandra-3.0
Commit: 728f94e798662bf8e0e4ad0f4d236394868cb7d6
Parents: 3cd7500
Author: Joshua McKenzie <jm...@apache.org>
Authored: Mon Oct 19 15:11:07 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Mon Oct 19 15:11:07 2015 -0400

----------------------------------------------------------------------
 bin/cassandra.ps1 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/728f94e7/bin/cassandra.ps1
----------------------------------------------------------------------
diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1
index 8cdd433..44ba9a4 100644
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@ -27,7 +27,7 @@ usage: cassandra.ps1 [-f] [-h] [-p pidfile] [-H dumpfile] [-D arg] [-E errorfile
     -E              change JVM ErrorFile
     -v              Print cassandra version and exit
     -s              Show detailed jvm environment information during launch
-    -a              Aggressive startup. Ignore ports that are TIME_WAIT for VerifyPorts check.
+    -a              Aggressive startup. Skip VerifyPorts check. For use in dev environments.
     -help           print this message
 
     NOTE: installing cassandra as a service requires Commons Daemon Service Runner
@@ -281,6 +281,10 @@ WARNING! Failed to write pidfile to $pidfile.  stop-server.bat and
 #-----------------------------------------------------------------------------
 Function VerifyPortsAreAvailable
 {
+    if ($a)
+    {
+        return
+    }
     # Need to confirm 5 different ports are available or die if any are currently bound
     # From cassandra.yaml:
     #   storage_port
@@ -308,10 +312,6 @@ Function VerifyPortsAreAvailable
     {
         if ($line -match "TCP" -and $line -match $portRegex)
         {
-            if ($a -and $line -match "TIME_WAIT")
-            {
-               continue
-            }
             Write-Error "Found a port already in use. Aborting startup"
             Write-Error $line
             Exit


[7/8] cassandra git commit: Fix MAX_HEAP_SIZE check on Windows startup

Posted by jm...@apache.org.
Fix MAX_HEAP_SIZE check on Windows startup

Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10553


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

Branch: refs/heads/cassandra-3.0
Commit: fa909cc420a349140d1a0b1b744350fad70f64b9
Parents: f807b8c
Author: Paulo Motta <pa...@gmail.com>
Authored: Mon Oct 19 15:12:19 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Mon Oct 19 15:12:19 2015 -0400

----------------------------------------------------------------------
 conf/cassandra-env.ps1 | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa909cc4/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 3c9d815..a38429e 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -128,6 +128,11 @@ Function CalculateHeapSizes
     }
 
     # Validate that we need to run this function and that our config is good
+    if ($env:MAX_HEAP_SIZE -and $env:HEAP_NEWSIZE)
+    {
+        return
+    }
+
     if (($env:MAX_HEAP_SIZE -and !$env:HEAP_NEWSIZE) -or (!$env:MAX_HEAP_SIZE -and $env:HEAP_NEWSIZE))
     {
         echo "Please set or unset MAX_HEAP_SIZE and HEAP_NEWSIZE in pairs.  Aborting startup."


[4/8] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Posted by jm...@apache.org.
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/f807b8c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f807b8c6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f807b8c6

Branch: refs/heads/cassandra-3.0
Commit: f807b8c6ed1af297d29314399b9f250a966581f4
Parents: 7159a75 728f94e
Author: Joshua McKenzie <jm...@apache.org>
Authored: Mon Oct 19 15:11:43 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Mon Oct 19 15:11:43 2015 -0400

----------------------------------------------------------------------
 bin/cassandra.ps1 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------



[6/8] cassandra git commit: Fix MAX_HEAP_SIZE check on Windows startup

Posted by jm...@apache.org.
Fix MAX_HEAP_SIZE check on Windows startup

Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10553


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

Branch: refs/heads/trunk
Commit: fa909cc420a349140d1a0b1b744350fad70f64b9
Parents: f807b8c
Author: Paulo Motta <pa...@gmail.com>
Authored: Mon Oct 19 15:12:19 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Mon Oct 19 15:12:19 2015 -0400

----------------------------------------------------------------------
 conf/cassandra-env.ps1 | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa909cc4/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 3c9d815..a38429e 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -128,6 +128,11 @@ Function CalculateHeapSizes
     }
 
     # Validate that we need to run this function and that our config is good
+    if ($env:MAX_HEAP_SIZE -and $env:HEAP_NEWSIZE)
+    {
+        return
+    }
+
     if (($env:MAX_HEAP_SIZE -and !$env:HEAP_NEWSIZE) -or (!$env:MAX_HEAP_SIZE -and $env:HEAP_NEWSIZE))
     {
         echo "Please set or unset MAX_HEAP_SIZE and HEAP_NEWSIZE in pairs.  Aborting startup."