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/14 20:45:13 UTC
[1/6] cassandra git commit: Add -a option to skip TIME_WAIT port
check on Windows startup
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 25366f7d4 -> 78753263e
refs/heads/cassandra-3.0 1415fa512 -> 5f5e9602d
refs/heads/trunk d4a297640 -> d87aab987
Add -a option to skip TIME_WAIT port check on Windows startup
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/78753263
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78753263
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/78753263
Branch: refs/heads/cassandra-2.2
Commit: 78753263e52ada59f8836e83f00c0613488df87e
Parents: 25366f7
Author: Joshua McKenzie <jm...@apache.org>
Authored: Wed Oct 14 14:43:32 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Oct 14 14:43:32 2015 -0400
----------------------------------------------------------------------
bin/cassandra.ps1 | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/78753263/bin/cassandra.ps1
----------------------------------------------------------------------
diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1
index 5cc99aa..8cdd433 100644
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@ -27,6 +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.
-help print this message
NOTE: installing cassandra as a service requires Commons Daemon Service Runner
@@ -307,6 +308,10 @@ 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
@@ -352,12 +357,15 @@ for ($i = 0; $i -lt $args.count; $i++)
"-install" { $install = $True }
"-uninstall" { $uninstall = $True }
"-help" { PrintUsage }
+ "-?" { PrintUsage }
+ "--help" { PrintUsage }
"-v" { $v = $True }
"-f" { $f = $True }
"-s" { $s = $True }
"-p" { $p = $args[++$i]; CheckEmptyParam($p) }
"-H" { $H = $args[++$i]; CheckEmptyParam($H) }
"-E" { $E = $args[++$i]; CheckEmptyParam($E) }
+ "-a" { $a = $True }
default
{
"Invalid argument: " + $args[$i];
[5/6] 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/5f5e9602
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f5e9602
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f5e9602
Branch: refs/heads/cassandra-3.0
Commit: 5f5e9602df803ba34260a62e12faec33a98dd428
Parents: 1415fa5 7875326
Author: Joshua McKenzie <jm...@apache.org>
Authored: Wed Oct 14 14:44:24 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Oct 14 14:44:24 2015 -0400
----------------------------------------------------------------------
bin/cassandra.ps1 | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
[4/6] 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/5f5e9602
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f5e9602
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f5e9602
Branch: refs/heads/trunk
Commit: 5f5e9602df803ba34260a62e12faec33a98dd428
Parents: 1415fa5 7875326
Author: Joshua McKenzie <jm...@apache.org>
Authored: Wed Oct 14 14:44:24 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Oct 14 14:44:24 2015 -0400
----------------------------------------------------------------------
bin/cassandra.ps1 | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
[6/6] 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/d87aab98
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d87aab98
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d87aab98
Branch: refs/heads/trunk
Commit: d87aab9872ca7d47f21562146e73f4f702bd5961
Parents: d4a2976 5f5e960
Author: Joshua McKenzie <jm...@apache.org>
Authored: Wed Oct 14 14:44:52 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Oct 14 14:44:52 2015 -0400
----------------------------------------------------------------------
bin/cassandra.ps1 | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
[3/6] cassandra git commit: Add -a option to skip TIME_WAIT port
check on Windows startup
Posted by jm...@apache.org.
Add -a option to skip TIME_WAIT port check on Windows startup
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/78753263
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78753263
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/78753263
Branch: refs/heads/trunk
Commit: 78753263e52ada59f8836e83f00c0613488df87e
Parents: 25366f7
Author: Joshua McKenzie <jm...@apache.org>
Authored: Wed Oct 14 14:43:32 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Oct 14 14:43:32 2015 -0400
----------------------------------------------------------------------
bin/cassandra.ps1 | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/78753263/bin/cassandra.ps1
----------------------------------------------------------------------
diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1
index 5cc99aa..8cdd433 100644
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@ -27,6 +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.
-help print this message
NOTE: installing cassandra as a service requires Commons Daemon Service Runner
@@ -307,6 +308,10 @@ 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
@@ -352,12 +357,15 @@ for ($i = 0; $i -lt $args.count; $i++)
"-install" { $install = $True }
"-uninstall" { $uninstall = $True }
"-help" { PrintUsage }
+ "-?" { PrintUsage }
+ "--help" { PrintUsage }
"-v" { $v = $True }
"-f" { $f = $True }
"-s" { $s = $True }
"-p" { $p = $args[++$i]; CheckEmptyParam($p) }
"-H" { $H = $args[++$i]; CheckEmptyParam($H) }
"-E" { $E = $args[++$i]; CheckEmptyParam($E) }
+ "-a" { $a = $True }
default
{
"Invalid argument: " + $args[$i];
[2/6] cassandra git commit: Add -a option to skip TIME_WAIT port
check on Windows startup
Posted by jm...@apache.org.
Add -a option to skip TIME_WAIT port check on Windows startup
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/78753263
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78753263
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/78753263
Branch: refs/heads/cassandra-3.0
Commit: 78753263e52ada59f8836e83f00c0613488df87e
Parents: 25366f7
Author: Joshua McKenzie <jm...@apache.org>
Authored: Wed Oct 14 14:43:32 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Oct 14 14:43:32 2015 -0400
----------------------------------------------------------------------
bin/cassandra.ps1 | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/78753263/bin/cassandra.ps1
----------------------------------------------------------------------
diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1
index 5cc99aa..8cdd433 100644
--- a/bin/cassandra.ps1
+++ b/bin/cassandra.ps1
@@ -27,6 +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.
-help print this message
NOTE: installing cassandra as a service requires Commons Daemon Service Runner
@@ -307,6 +308,10 @@ 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
@@ -352,12 +357,15 @@ for ($i = 0; $i -lt $args.count; $i++)
"-install" { $install = $True }
"-uninstall" { $uninstall = $True }
"-help" { PrintUsage }
+ "-?" { PrintUsage }
+ "--help" { PrintUsage }
"-v" { $v = $True }
"-f" { $f = $True }
"-s" { $s = $True }
"-p" { $p = $args[++$i]; CheckEmptyParam($p) }
"-H" { $H = $args[++$i]; CheckEmptyParam($H) }
"-E" { $E = $args[++$i]; CheckEmptyParam($E) }
+ "-a" { $a = $True }
default
{
"Invalid argument: " + $args[$i];