GEOMESA-3564 CLI - Remove Nailgun support (#3527)

Author: elahrvivaz

build/dependencies.txt

@@ -3,7 +3,6 @@ com.chuusai:shapeless_2.12:2.3.10:compile
 com.clearspring.analytics:stream:2.9.8:compile
 com.esotericsoftware:kryo-shaded:4.0.3:compile
 com.esotericsoftware:minlog:1.3.0:compile
-com.facebook:nailgun-server:1.0.1:compile
 com.fasterxml.jackson.core:jackson-annotations:2.21:compile
 com.fasterxml.jackson.core:jackson-core:2.21.1:compile
 com.fasterxml.jackson.core:jackson-databind:2.21.1:compile
@@ -105,8 +104,6 @@ javax.annotation:javax.annotation-api:1.2:compile
 javax.annotation:javax.annotation-api:1.3.2:compile
 javax.measure:unit-api:2.2:compile
 javax.xml.bind:jaxb-api:2.4.0-b180830.0359:compile
-net.java.dev.jna:jna-platform:5.14.0:compile
-net.java.dev.jna:jna:5.14.0:compile
 net.jodah:typetools:0.6.1:compile
 net.minidev:accessors-smart:2.5.2:compile
 net.minidev:json-smart:2.5.2:compile

docs/user/cli/index.rst

@@ -20,7 +20,6 @@ overview of the commands available for most back-ends.
     logging
     filesystems
     console
-    nailgun
     geotools
 
 Specific back-end implementations are described in the following chapters:

docs/user/cli/nailgun.rst

@@ -35,14 +35,6 @@ Argument                  Description
 
 Lists available commands. The arguments for specific commands can be shown using ``help <command>``.
 
-.. _ng_command:
-
-``ng``
-------
-
-The ``ng`` command can be used to ``start``, ``stop``, get ``stats``, or view the ``classpath`` from the
-command Nailgun server. See :ref:`nailgun_server` for details.
-
 ``version``
 -----------
 

docs/user/cli/status.rst

@@ -115,6 +115,12 @@ Deprecated Methods
 * ``org.locationtech.geomesa.index.api.GeoMesaFeatureIndexFactory.indices``
 * ``org.locationtech.geomesa.index.planning.StrategyDecider.selectFilterPlan``
 
+Removal of Nailgun Support
+--------------------------
+
+The command-line tools no longer support using Nailgun to run a persistent service. Nailgun is no longer maintained, and
+doesn't work with current Java versions.
+
 Internal API Changes
 --------------------
 

docs/user/upgrade/6.0.0.rst

@@ -160,12 +160,6 @@
       <fileMode>0755</fileMode>
       <filtered>true</filtered>
     </file>
-    <!-- nailgun client -->
-    <file>
-      <source>../../geomesa-tools/bin/ng</source>
-      <outputDirectory>bin</outputDirectory>
-      <fileMode>0755</fileMode>
-    </file>
     <!-- geomesa-site.xml.template -->
     <file>
       <source>../../geomesa-utils-parent/geomesa-utils/src/main/resources/org/locationtech/geomesa/geomesa-site.xml.template</source>

geomesa-archetypes/geomesa-archetypes-binary-dist/assembly.xml

@@ -22,8 +22,6 @@ if [[ -n "$GEOMESA_CONF_DIR" ]] &&  [[ ! "$GEOMESA_CONF_DIR" -ef "$%%tools.dist.
 fi
 export GEOMESA_CONF_DIR="${%%tools.dist.name%%_HOME}/conf"
 
-NG_RUNNER="org.locationtech.geomesa.tools.utils.NailgunServer"
-
 source "${GEOMESA_CONF_DIR}/geomesa-env.sh"
 source "${GEOMESA_CONF_DIR}/functions.sh"
 
@@ -82,42 +80,6 @@ function get_classpath() {
   fi
 }
 
-function start_nailgun() {
-  load_classpath
-  local NG_OPTS=()
-  if [[ -n "$GEOMESA_NG_SERVER" ]]; then
-    NG_OPTS+=("-host" "$GEOMESA_NG_SERVER")
-  fi
-  if [[ -n "$GEOMESA_NG_PORT" ]]; then
-    NG_OPTS+=("--port" "$GEOMESA_NG_PORT")
-  fi
-  if [[ -n "$GEOMESA_NG_TIMEOUT" ]]; then
-    NG_OPTS+=("--timeout" "$GEOMESA_NG_TIMEOUT")
-  fi
-  if [[ -n "$GEOMESA_NG_IDLE" ]]; then
-    NG_OPTS+=("--idle" "$GEOMESA_NG_IDLE")
-  fi
-  if [[ -n "$GEOMESA_NG_POOL_SIZE" ]]; then
-    NG_OPTS+=("--pool-size" "$GEOMESA_NG_POOL_SIZE")
-  fi
-  echo -n "Starting Nailgun server... " >&2
-  # create a named pipe to read our nailgun startup output
-  fd="$(mktemp --tmpdir ngfdXXXX)" && rm "$fd" && mkfifo "$fd"
-  exec 3<>"$fd" # tie the pipe to output 3
-  rm "$fd" # remove the pipe so that the process can exit normally
-  # start nailgun in the background and redirect output to the pipe
-  # shellcheck disable=SC2086
-  nohup java $GEOMESA_OPTS -cp "$CLASSPATH" $NG_RUNNER "${NG_OPTS[@]}" >&3 2>&1 </dev/null &
-  # read the output from the nailgun start up, timeout after 60 seconds
-  read -t 60 -r ng_output <&3
-  echo "$ng_output" >&2
-  if ! echo "$ng_output" | grep -q started; then
-    echo "Error starting Nailgun server" >&2
-    exit 1
-  fi
-}
-
-
 if [[ $1 = classpath ]]; then
   get_classpath | tr ':' '\n' | sort
 elif [[ $1 = configure ]]; then
@@ -128,22 +90,6 @@ elif [[ $1 = scala-console ]]; then
   # scala console requires options to be passed in through java_opts
   export JAVA_OPTS="${GEOMESA_OPTS}"
   geomesa_scala_console "$(get_classpath)" "$@"
-elif [[ $1 = ng && $2 = start ]]; then
-  start_nailgun
-elif [[ $1 = ng && $2 = stop ]]; then
-  "${%%tools.dist.name%%_HOME}"/bin/ng ng-stop
-elif [[ $1 = ng && $2 = classpath ]]; then
-  "${%%tools.dist.name%%_HOME}"/bin/ng ng-cp
-elif [[ "$GEOMESA_NG_ENABLED" = "true" ]]; then
-  # check to see if the nailgun server is up
-  "${%%tools.dist.name%%_HOME}"/bin/ng ng-version >/dev/null 2>&1
-  RET=$?
-  if [[ $RET -ne 0 ]]; then
-    # it's not running, start the nailgun server
-    start_nailgun
-  fi
-  # invoke the nailgun client
-  "${%%tools.dist.name%%_HOME}"/bin/ng "%%tools.runner%%" "$@"
 else
   load_classpath
   # shellcheck disable=SC2086

geomesa-tools/bin/geomesa-tools

@@ -52,35 +52,11 @@ export CUSTOM_JAVA_OPTS="${CUSTOM_JAVA_OPTS} $JAVA_OPTS"
 # add additional native libraries to the java classpath (LD_LIBRARY_PATH)
 # export JAVA_LIBRARY_PATH="${JAVA_LIBRARY_PATH:-/path/to/java/native/library}"
 
-# ==================================================================
-# GeoMesa Nailgun Server Variables
-# ==================================================================
-
-# enable or disable a nailgun server for faster commands
-export GEOMESA_NG_ENABLED="${GEOMESA_NG_ENABLED:-false}"
-# host and port used to run nailgun server
-export GEOMESA_NG_SERVER="${GEOMESA_NG_SERVER:-$NAILGUN_SERVER}"
-export GEOMESA_NG_PORT="${GEOMESA_NG_PORT:-$NAILGUN_PORT}"
-# timeout for ng client heartbeats
-export GEOMESA_NG_TIMEOUT="${GEOMESA_NG_TIMEOUT:-}"
-# time before the nailgun server is shut down due to inactivity
-export GEOMESA_NG_IDLE="${GEOMESA_NG_IDLE:-1 hour}"
-# size of the thread pool used for handling requests
-export GEOMESA_NG_POOL_SIZE="${GEOMESA_NG_POOL_SIZE:-}"
-
 # ==================================================================
 # Export the variables configured above as needed
-# This section shouldn't need to be modified
+# The remainder of this file shouldn't need to be modified
 # ==================================================================
 
-# export the above nailgun options for use by the ng client
-if [[ -n "${GEOMESA_NG_SERVER}" ]]; then
-  export NAILGUN_SERVER="${GEOMESA_NG_SERVER}"
-fi
-if [[ -n "${GEOMESA_NG_PORT}" ]]; then
-  export NAILGUN_PORT="${GEOMESA_NG_PORT}"
-fi
-
 # set java opts
 GEOMESA_OPTS="-Duser.timezone=UTC -DEPSG-HSQL.directory=/tmp/$(whoami) -Djava.awt.headless=true\
  -Dlog4j.configuration=file://${GEOMESA_CONF_DIR}/log4j.properties -Dgeomesa.home=${%%tools.dist.name%%_HOME}\

geomesa-tools/bin/ng

@@ -76,11 +76,6 @@
             <groupId>org.scala-lang.modules</groupId>
             <artifactId>scala-xml_${scala.binary.version}</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.facebook</groupId>
-            <artifactId>nailgun-server</artifactId>
-            <version>1.0.1</version>
-        </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>