dist/ubuntu: Remove unneeded startup parameters

Fixes #19.

Signed-off-by: Pekka Enberg <penberg@scylladb.com>

SCYLLA-VERSION-GEN

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VERSION=1.0
+VERSION=0.13.2
 
 if test -f version
 then

dist/common/sysconfig/scylla-jmx

@@ -1,12 +1,3 @@
-# The jmx port to open
-JMX_PORT=7199
-
-# The API port to connect to
-API_PORT=10000
-
-# The API address to connect to
-ADDR=127.0.0.1
-
 # scylla home dir
 SCYLLA_HOME=/var/lib/scylla
 

dist/redhat/systemd/scylla-jmx.service

@@ -8,7 +8,7 @@ Type=simple
 EnvironmentFile=/etc/sysconfig/scylla-jmx
 User=scylla
 Group=scylla
-ExecStart=/usr/lib/scylla/jmx/scylla-jmx -jp $JMX_PORT -p $API_PORT -a $ADDR -l /usr/lib/scylla/jmx
+ExecStart=/usr/lib/scylla/jmx/scylla-jmx -l /usr/lib/scylla/jmx
 KillMode=process
 Restart=always
 

dist/ubuntu/debian/scylla-jmx.init

@@ -30,7 +30,7 @@ SCRIPTNAME=/etc/init.d/$NAME
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
 export SCYLLA_HOME SCYLLA_CONF
-DAEMON=/usr/lib/scylla/jmx/scylla-jmx -jp $JMX_PORT -p $API_PORT -a $ADDR -l /usr/lib/scylla/jmx
+DAEMON=/usr/lib/scylla/jmx/scylla-jmx -l /usr/lib/scylla/jmx
 
 # Define LSB log_* functions.
 . /lib/lsb/init-functions

dist/ubuntu/debian/scylla-jmx.upstart

@@ -14,5 +14,5 @@ console log
 script
     . /etc/default/scylla-jmx
     export SCYLLA_HOME SCYLLA_CONF
-    exec /usr/lib/scylla/jmx/scylla-jmx -jp $JMX_PORT -p $API_PORT -a $ADDR -l /usr/lib/scylla/jmx
+    exec /usr/lib/scylla/jmx/scylla-jmx -l /usr/lib/scylla/jmx
 end script

scripts/scylla-jmx

@@ -2,20 +2,22 @@
 #
 #  Copyright (C) 2015 Cloudius Systems, Ltd.
 
-JMX_PORT=7199
-API_ADDR="127.0.0.1"
-API_PORT="10000"
+JMX_PORT="7199"
+API_ADDR=""
+API_PORT=""
+CONF_FILE=""
 PARAM_HELP="-h"
 PARAM_JMX_PORT="-jp"
 PARAM_API_PORT="-p"
 PARAM_ADDR="-a"
 PARAM_LOCATION="-l"
 LOCATION="target"
+PARAM_FILE="-cf"
 
 print_help() {
  cat <<HLPEND
 
-scylla-jmx [$PARAM_HELP] [$PARAM_PORT port] [$PARAM_ADDR address]
+scylla-jmx [$PARAM_HELP] [$PARAM_API_PORT port] [$PARAM_ADDR address] [$PARAM_JMX_PORT port] [$PARAM_FILE file]
 
 This script is used to run the jmx proxy
 
@@ -27,6 +29,7 @@ This script receives the following command line arguments:
     $PARAM_JMX_PORT <port> - The jmx port to open
     $PARAM_API_PORT <port> - The API port to connect to
     $PARAM_ADDR <address> - The API address to connect to
+    $PARAM_FILE <file> - A configuration file to use
     $PARAM_LOCATION <location> - The location of the jmx proxy jar file
 HLPEND
 }
@@ -35,11 +38,11 @@ while test "$#" -ne 0
 do
   case "$1" in
     "$PARAM_API_PORT")
-      API_PORT=$2
+      API_PORT="-Dapiport="$2
       shift 2
       ;;
     "$PARAM_ADDR")
-      API_ADDR=$2
+      API_ADDR="-Dapiaddress="$2
       shift 2
       ;;
     "$PARAM_PORT")
@@ -54,6 +57,10 @@ do
       LOCATION=$2
       shift 2
       ;;
+    "$PARAM_FILE")
+      CONF_FILE="-Dapiconfig="$2
+      shift 2
+      ;;
     "$PARAM_HELP")
       print_help
       exit 0
@@ -62,4 +69,4 @@ do
     esac
 done
 
-exec java -Dapiaddress=$API_ADDR -Dapiport=$API_PORT -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=$JMX_PORT -Dcom.sun.management.jmxremote.rmi.port=$JMX_PORT -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -jar $LOCATION/urchin-mbean-1.0.jar
+exec java $API_ADDR $API_PORT $CONF_FILE -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=$JMX_PORT -Dcom.sun.management.jmxremote.rmi.port=$JMX_PORT -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -jar $LOCATION/urchin-mbean-1.0.jar

src/main/java/com/cloudius/urchin/api/APIClient.java

@@ -423,14 +423,14 @@ public class APIClient {
         return null;
     }
 
-    private TabularDataSupport getSnapshotData(String ks, JsonArray arr) {
+    private TabularDataSupport getSnapshotData(String key, JsonArray arr) {
         TabularDataSupport data = new TabularDataSupport(
                 SnapshotDetailsTabularData.TABULAR_TYPE);
 
         for (int i = 0; i < arr.size(); i++) {
             JsonObject obj = arr.getJsonObject(i);
-            if (obj.containsKey("key") && obj.containsKey("cf")) {
-                SnapshotDetailsTabularData.from(obj.getString("key"), ks,
+            if (obj.containsKey("ks") && obj.containsKey("cf")) {
+                SnapshotDetailsTabularData.from(key, obj.getString("ks"),
                         obj.getString("cf"), obj.getInt("total"),
                         obj.getInt("live"), data);
             }

src/main/java/org/apache/cassandra/service/StorageService.java

@@ -329,7 +329,13 @@ public class StorageService extends NotificationBroadcasterSupport
     /** Human-readable load value. Keys are IP addresses. */
     public Map<String, String> getLoadMap() {
         log(" getLoadMap()");
-        return c.getMapStrValue("/storage_service/load_map");
+        Map<String, String> load = c.getMapStrValue("/storage_service/load_map");
+        Map<String, String> map = new HashMap<>();
+        for (Map.Entry<String, String> entry : load.entrySet())
+        {
+            map.put(entry.getKey(), FileUtils.stringifyFileSize(Double.parseDouble(entry.getValue())));
+        }
+        return map;
     }
 
     /**