release: prepare for 2.0.5

Signed-off-by: Shlomi Livne <shlomi@scylladb.com>

SCYLLA-VERSION-GEN

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

dist/debian/build_deb.sh

@@ -48,7 +48,7 @@ if [ "$(arch)" != "x86_64" ]; then
 fi
 
 if [ -e debian ] || [ -e build/release ]; then
-    rm -rf debian build conf/hotspot_compiler
+    rm -rf debian build
     mkdir build
 fi
 if is_debian_variant; then
@@ -100,12 +100,12 @@ cp dist/debian/rules.in debian/rules
 sed -i -e "s/@@VERSION@@/$SCYLLA_VERSION/g" debian/changelog
 sed -i -e "s/@@RELEASE@@/$SCYLLA_RELEASE/g" debian/changelog
 sed -i -e "s/@@CODENAME@@/$TARGET/g" debian/changelog
-if [ "$DISTRIBUTION" = "Ubuntu" ]; then
-    sed -i -e "s/@@REVISION@@/0ubuntu1/g" debian/changelog
+if [ "$TARGET" = "trusty" ] || [ "$TARGET" = "xenial" ] || [ "$TARGET" = "yakkety" ] || [ "$TARGET" = "zesty" ] || [ "$TARGET" = "artful" ]; then
+    sed -i -e "s/@@REVISION@@/0ubuntu1~$TARGET/g" debian/changelog
 else
-    sed -i -e "s/@@REVISION@@/1/g" debian/changelog
+    sed -i -e "s/@@REVISION@@/1~$TARGET/g" debian/changelog
 fi
-if [ "$RELEASE" = "14.04" ]; then
+if [ "$TARGET" = "trusty" ]; then
     sed -i -e "s/@@DH_INSTALLINIT@@/--upstart-only/g" debian/rules
 else
     sed -i -e "s/@@DH_INSTALLINIT@@//g" debian/rules
@@ -114,7 +114,7 @@ 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/$TARGET-base.tgz
+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 create
 sudo -E DIST=$TARGET /usr/sbin/pbuilder update

dist/debian/pbuilderrc

@@ -1,23 +1,25 @@
 USENETWORK=yes
 BUILD_HOME=/tmp
-BASETGZ="/var/cache/pbuilder/$DIST-base.tgz"
+BASETGZ="/var/cache/pbuilder/scylla-jmx-$DIST.tgz"
 DISTRIBUTION="$DIST"
-BUILDRESULT="/var/cache/pbuilder/$DIST/result/"
-APTCACHE="/var/cache/pbuilder/$DIST/aptcache/"
+BUILDRESULT="/var/cache/pbuilder/scylla-jmx-$DIST/result/"
+APTCACHE="/var/cache/pbuilder/scylla-jmx-$DIST/aptcache/"
 ALLOWUNTRUSTED=yes
 
-if [ "$DIST" = "trusty" ] || [ "$DIST" = "xenial" ]; then
+if [ "$DIST" = "trusty" ] || [ "$DIST" = "xenial" ] || [ "$DIST" = "yakkety" ] || [ "$DIST" = "zesty" ] || [ "$DIST" = "artful" ]; then
     MIRRORSITE="http://archive.ubuntu.com/ubuntu/"
     COMPONENTS="main restricted universe multiverse"
     DEBOOTSTRAPOPTS="--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg"
     if [ "$DIST" = "trusty" ]; then
         OTHERMIRROR="deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu trusty main"
     fi
-elif [ "$DIST" = "jessie" ]; then
-    MIRRORSITE="http://ftp.us.debian.org/debian/"
+elif [ "$DIST" = "jessie" ] || [ "$DIST" = "stretch" ] || [ "$DIST" = "buster" ] || [ "$DIST" = "sid" ]; then
+    MIRRORSITE="http://deb.debian.org/debian/"
     COMPONENTS="main contrib non-free"
     DEBOOTSTRAPOPTS="--keyring=/usr/share/keyrings/debian-archive-keyring.gpg"
+    if [ "$DIST" = "jessie" ]; then
         OTHERMIRROR="deb http://httpredir.debian.org/debian jessie-backports main"
+    fi
 else
     echo "Unknown distribution: $DIST"
     exit 1

dist/redhat/build_rpm.sh

@@ -43,7 +43,7 @@ if [ "$(arch)" != "x86_64" ]; then
 fi
 if [ -z "$TARGET" ]; then
     if [ "$ID" = "centos" -o "$ID" = "rhel" ] && [ "$VERSION_ID" = "7" ]; then
-        TARGET=epel-7-x86_64
+        TARGET=./dist/redhat/mock/scylla-jmx-epel-7-x86_64.cfg
     elif [ "$ID" = "fedora" ]; then
         TARGET=$ID-$VERSION_ID-x86_64
     else

dist/redhat/mock/scylla-jmx-epel-7-x86_64.cfg

@@ -0,0 +1,72 @@
+config_opts['root'] = 'epel-7-x86_64'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64',)
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
+config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
+config_opts['releasever'] = '7'
+config_opts['rpmbuild_networking'] = True
+
+config_opts['yum.conf'] = """
+[main]
+keepcache=1
+debuglevel=2
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+syslog_ident=mock
+syslog_device=
+mdpolicy=group:primary
+best=1
+
+# repos
+[base]
+name=BaseOS
+mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os
+failovermethod=priority
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-7
+gpgcheck=1
+
+[updates]
+name=updates
+enabled=1
+mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates
+failovermethod=priority
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-7
+gpgcheck=1
+
+[epel]
+name=epel
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64
+failovermethod=priority
+gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-7
+gpgcheck=1
+
+[extras]
+name=extras
+mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=extras
+failovermethod=priority
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-7
+gpgcheck=1
+
+[testing]
+name=epel-testing
+enabled=0
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel7&arch=x86_64
+failovermethod=priority
+
+
+[local]
+name=local
+baseurl=https://kojipkgs.fedoraproject.org/repos/epel7-build/latest/x86_64/
+cost=2000
+enabled=0
+
+[epel-debuginfo]
+name=epel-debug
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-7&arch=x86_64
+failovermethod=priority
+enabled=0
+"""

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;