release: prepare for 2.2.2 by hagitsegev

dist/debian: robustly enable networking in build_deb.sh
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)
2019-01-12 18:28:40 +02:00 · 2018-10-21 17:50:35 +03:00 · 2018-10-21 12:14:25 +03:00 · 2018-07-01 22:41:28 +03:00 · 2018-05-30 17:33:36 +03:00 · 2018-05-16 21:35:46 +03:00
4 changed files with 15 additions and 10 deletions
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 #!/bin/sh

-VERSION=666.development
+VERSION=2.2.2

 if test -f version
 then
--- a/dist/debian/build_deb.sh
+++ b/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 create
-sudo -E DIST=$TARGET /usr/sbin/pbuilder update
+sudo -E DIST=$TARGET /usr/sbin/pbuilder clean --configfile ./dist/debian/pbuilderrc
+sudo -E DIST=$TARGET /usr/sbin/pbuilder create --configfile ./dist/debian/pbuilderrc
+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
--- a/dist/redhat/build_rpm.sh
+++ b/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
--- a/src/main/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/main/java/org/apache/cassandra/gms/FailureDetector.java
@ -105,9 +105,11 @@ 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");
-            for (int j = 0; j < states.size(); j++) {
-                JsonObject state = states.getJsonObject(j);
-                ep.addApplicationState(state.getInt("application_state"), state.getString("value"));
+            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);
        }
Author	SHA1	Message	Date
Jenkins	e093231e10	release: prepare for 2.2.2 by hagitsegev	2019-01-12 18:28:40 +02:00
Avi Kivity	4b6c1f9fd1	dist/debian: robustly enable networking in build_deb.sh 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`)	2018-10-21 17:50:35 +03:00
Hagit Segev	fefe06f1d1	release: prepare for 2.2.1	2018-10-21 12:14:25 +03:00
Shlomi Livne	2e6a37892c	release: prepare for 2.2.0 Signed-off-by: Shlomi Livne <shlomi@scylladb.com>	2018-07-01 22:41:28 +03:00
Shlomi Livne	003efee260	release: prepare for 2.2.rc2 Signed-off-by: Shlomi Livne <shlomi@scylladb.com>	2018-05-30 17:33:36 +03:00
Shlomi Livne	4d3a6bb72c	release: prepare for 2.2.rc1 Signed-off-by: Shlomi Livne <shlomi@scylladb.com>	2018-05-16 21:35:46 +03:00
Avi Kivity	1910a00800	release: prepare for 2.2.rc0	2018-04-18 11:06:29 +03:00
Avi Kivity	557c4943c0	dist: recognize epel-7-x86_64 mock target and enable networking The default epel-7-x86_64 wisely disables networking, however our maven build accesses the maven repository during the build process. Recognize the target name and redirect it to our networking-enabled configuration. Message-Id: <20180408122138.16672-1-avi@scylladb.com> (cherry picked from commit `dd8d5c87ed`)	2018-04-16 12:49:58 +03:00
Amnon Heiman	5aaa5faee7	FailureDetector: check that states is not null before use When a node is part of a cluster but is down (like in the situation where a cluster is taken down and up again but not all nodes are up). There is no application_state information for that node. This patch check that the information exists before using it to prevent null pointer exception. After this patch, a call to nodetool gossipinfo would return the available information without failing. See scylladb/scylla#3330 Signed-off-by: Amnon Heiman <amnon@scylladb.com> Message-Id: <20180329115345.29357-1-amnon@scylladb.com> (cherry picked from commit `4e4589ba6f`)	2018-03-29 15:23:59 +03:00