[3/3] accumulo git commit: ACCUMULO-3409 Move fixed ports out of ephemeral range

[el...@apache.org]

ACCUMULO-3409 Move fixed ports out of ephemeral range


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

Branch: refs/heads/master
Commit: 1c091b34911f447132836b9fa7b125a603318d3f
Parents: a7021b6
Author: Josh Elser <el...@apache.org>
Authored: Wed Jul 8 12:11:37 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jul 8 13:09:12 2015 -0400

----------------------------------------------------------------------
 INSTALL.md                                                     | 4 ++--
 core/src/main/java/org/apache/accumulo/core/conf/Property.java | 4 ++--
 docs/src/main/asciidoc/chapters/administration.txt             | 6 +++---
 docs/src/main/asciidoc/chapters/design.txt                     | 2 +-
 docs/src/main/asciidoc/chapters/troubleshooting.txt            | 4 ++--
 docs/src/main/resources/examples/README.helloworld             | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1c091b34/INSTALL.md
----------------------------------------------------------------------
diff --git a/INSTALL.md b/INSTALL.md
index 32f74ca..ae31de3 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -142,9 +142,9 @@ Accumulo shell.
 
     ./bin/accumulo shell -u root
 
-Use your web browser to connect the Accumulo monitor page on port 50095.
+Use your web browser to connect the Accumulo monitor page on port 9995.
 
-    http://<hostname in conf/monitor>:50095/
+    http://<hostname in conf/monitor>:9995/
 
 When finished, use the following command to stop Accumulo.
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/1c091b34/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index c15dabc..cde6a9f 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -340,7 +340,7 @@ public enum Property {
   GC_CYCLE_START("gc.cycle.start", "30s", PropertyType.TIMEDURATION, "Time to wait before attempting to garbage collect any old files."),
   GC_CYCLE_DELAY("gc.cycle.delay", "5m", PropertyType.TIMEDURATION, "Time between garbage collection cycles. In each cycle, old files "
       + "no longer in use are removed from the filesystem."),
-  GC_PORT("gc.port.client", "50091", PropertyType.PORT, "The listening port for the garbage collector's monitor service"),
+  GC_PORT("gc.port.client", "9998", PropertyType.PORT, "The listening port for the garbage collector's monitor service"),
   GC_DELETE_THREADS("gc.threads.delete", "16", PropertyType.COUNT, "The number of threads used to delete files"),
   GC_TRASH_IGNORE("gc.trash.ignore", "false", PropertyType.BOOLEAN, "Do not use the Trash, even if it is configured."),
   GC_FILE_ARCHIVE("gc.file.archive", "false", PropertyType.BOOLEAN, "Archive any files/directories instead of moving to the HDFS trash or deleting."),
@@ -348,7 +348,7 @@ public enum Property {
 
   // properties that are specific to the monitor server behavior
   MONITOR_PREFIX("monitor.", null, PropertyType.PREFIX, "Properties in this category affect the behavior of the monitor web server."),
-  MONITOR_PORT("monitor.port.client", "50095", PropertyType.PORT, "The listening port for the monitor's http service"),
+  MONITOR_PORT("monitor.port.client", "9995", PropertyType.PORT, "The listening port for the monitor's http service"),
   MONITOR_LOG4J_PORT("monitor.port.log4j", "4560", PropertyType.PORT, "The listening port for the monitor's log4j logging collection."),
   MONITOR_BANNER_TEXT("monitor.banner.text", "", PropertyType.STRING, "The banner text displayed on the monitor page."),
   MONITOR_BANNER_COLOR("monitor.banner.color", "#c4c4c4", PropertyType.STRING, "The color of the banner text displayed on the monitor page."),

http://git-wip-us.apache.org/repos/asf/accumulo/blob/1c091b34/docs/src/main/asciidoc/chapters/administration.txt
----------------------------------------------------------------------
diff --git a/docs/src/main/asciidoc/chapters/administration.txt b/docs/src/main/asciidoc/chapters/administration.txt
index f5f16bb..1300be1 100644
--- a/docs/src/main/asciidoc/chapters/administration.txt
+++ b/docs/src/main/asciidoc/chapters/administration.txt
@@ -49,12 +49,12 @@ their value in conf/accumulo-site.xml.
 |Port | Description | Property Name
 |4445 | Shutdown Port (Accumulo MiniCluster) | n/a
 |4560 | Accumulo monitor (for centralized log display) | monitor.port.log4j
+|9995 | Accumulo HTTP monitor | monitor.port.client
 |9997 | Tablet Server | tserver.port.client
+|9998 | Accumulo GC | gc.port.client
 |9999 | Master Server | master.port.client
 |12234 | Accumulo Tracer | trace.port.client
 |42424 | Accumulo Proxy Server | n/a
-|50091 | Accumulo GC | gc.port.client
-|50095 | Accumulo HTTP monitor | monitor.port.client
 |10001 | Master Replication service | master.replication.coordinator.port
 |10002 | TabletServer Replication service | replication.receipt.service.port
 |====
@@ -434,7 +434,7 @@ when the tablets are re-hosted.
 ==== Accumulo Monitor
 The Accumulo Monitor provides an interface for monitoring the status and health of
 Accumulo components. The Accumulo Monitor provides a web UI for accessing this information at
-+http://_monitorhost_:50095/+.
++http://_monitorhost_:9995/+.
 
 Things highlighted in yellow may be in need of attention.
 If anything is highlighted in red on the monitor page, it is something that definitely needs attention.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/1c091b34/docs/src/main/asciidoc/chapters/design.txt
----------------------------------------------------------------------
diff --git a/docs/src/main/asciidoc/chapters/design.txt b/docs/src/main/asciidoc/chapters/design.txt
index 34cd459..6c77cb6 100644
--- a/docs/src/main/asciidoc/chapters/design.txt
+++ b/docs/src/main/asciidoc/chapters/design.txt
@@ -175,6 +175,6 @@ grouped by tablet.  TabletServers can quickly apply the mutations from the sorte
 that are destined for the tablets they have now been assigned.
 
 TabletServer failures are noted on the Master's monitor page, accessible via
-+http://master-address:50095/monitor+.
++http://master-address:9995/monitor+.
 
 image::failure_handling.png[width=500]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/1c091b34/docs/src/main/asciidoc/chapters/troubleshooting.txt
----------------------------------------------------------------------
diff --git a/docs/src/main/asciidoc/chapters/troubleshooting.txt b/docs/src/main/asciidoc/chapters/troubleshooting.txt
index cd2923c..ada0fbf 100644
--- a/docs/src/main/asciidoc/chapters/troubleshooting.txt
+++ b/docs/src/main/asciidoc/chapters/troubleshooting.txt
@@ -44,7 +44,7 @@ There's a small web server that collects information about all the
 components that make up a running Accumulo instance. It will highlight
 unusual or unexpected conditions.
 
-*A*: Point your browser to the monitor (typically the master host, on port 50095).  Is anything red or yellow?
+*A*: Point your browser to the monitor (typically the master host, on port 9995).  Is anything red or yellow?
 
 *Q*: My browser is reporting connection refused, and I cannot get to the monitor
 
@@ -65,7 +65,7 @@ from your browser.
 It is sometimes helpful to use a text-only browser to sanity-check the
 monitor while on the machine running the monitor:
 
-    $ links http://localhost:50095
+    $ links http://localhost:9995
 
 *A*: Verify that you are not firewalled from the monitor if it is running on a remote host.
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/1c091b34/docs/src/main/resources/examples/README.helloworld
----------------------------------------------------------------------
diff --git a/docs/src/main/resources/examples/README.helloworld b/docs/src/main/resources/examples/README.helloworld
index 7d41ba3..618e301 100644
--- a/docs/src/main/resources/examples/README.helloworld
+++ b/docs/src/main/resources/examples/README.helloworld
@@ -35,7 +35,7 @@ Launch a Java program that inserts data with a BatchWriter:
 
 On the accumulo status page at the URL below (where 'master' is replaced with the name or IP of your accumulo master), you should see 50K entries
 
-    http://master:50095/
+    http://master:9995/
 
 To view the entries, use the shell to scan the table: