release: prepare for 2.2.2 by hagitsegev

build_deb is randomly failing due to not picking up USENETWORK=yes
in the config file. Fix by switching to explicit specification of
the pbuilder configuration file, instead of hoping pbuilder will
pick it up from root's home directory.

Partial backport of cd1c79f90f.

(cherry picked from commit 15aacb40fc)

SCYLLA-VERSION-GEN

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VERSION=666.development
+VERSION=2.2.2
 
 if test -f version
 then

dist/debian/build_deb.sh

@@ -113,14 +113,13 @@ fi
 cp dist/common/systemd/scylla-jmx.service.in debian/scylla-jmx.service
 sed -i -e "s#@@SYSCONFDIR@@#/etc/default#g" debian/scylla-jmx.service
 
-cp ./dist/debian/pbuilderrc ~/.pbuilderrc
 sudo rm -fv /var/cache/pbuilder/scylla-jmx-$TARGET.tgz
-sudo -E DIST=$TARGET /usr/sbin/pbuilder clean
+sudo -E DIST=$TARGET /usr/sbin/pbuilder clean --configfile ./dist/debian/pbuilderrc
-sudo -E DIST=$TARGET /usr/sbin/pbuilder create
+sudo -E DIST=$TARGET /usr/sbin/pbuilder create --configfile ./dist/debian/pbuilderrc
-sudo -E DIST=$TARGET /usr/sbin/pbuilder update
+sudo -E DIST=$TARGET /usr/sbin/pbuilder update --configfile ./dist/debian/pbuilderrc
 if [ "$TARGET" = "jessie" ]; then
     echo "apt-get install -y -t jessie-backports ca-certificates-java" > build/jessie-pkginst.sh
     chmod a+rx build/jessie-pkginst.sh
-    sudo -E DIST=$TARGET /usr/sbin/pbuilder execute build/jessie-pkginst.sh
+    sudo -E DIST=$TARGET /usr/sbin/pbuilder execute --configfile ./dist/debian/pbuilderrc  build/jessie-pkginst.sh
 fi
-sudo -E DIST=$TARGET pdebuild --buildresult build/debs
+sudo -E DIST=$TARGET pdebuild --configfile ./dist/debian/pbuilderrc --buildresult build/debs

dist/redhat/build_rpm.sh

@@ -52,6 +52,10 @@ if [ -z "$TARGET" ]; then
     fi
 fi
 
+if [[ "$TARGET" = epel-7-x86_64 ]]; then
+    TARGET=./dist/redhat/mock/scylla-jmx-epel-7-x86_64.cfg
+fi
+
 if [ ! -f /usr/bin/mock ]; then
     pkg_install mock
 fi

src/main/java/org/apache/cassandra/gms/FailureDetector.java

@@ -105,10 +105,12 @@ public class FailureDetector extends APIMBean implements FailureDetectorMBean {
             ep.setAliave(obj.getBoolean("is_alive"));
             ep.setUpdateTimestamp(obj.getJsonNumber("update_time").longValue());
             JsonArray states = obj.getJsonArray("application_state");
+            if (states != null) {
                 for (int j = 0; j < states.size(); j++) {
                     JsonObject state = states.getJsonObject(j);
                     ep.addApplicationState(state.getInt("application_state"), state.getString("value"));
                 }
+            }
             res.put(obj.getString("addrs"), ep);
         }
         return res;