release: prepare for 2.3.6 by hagitsegev

Since jessie-backports repo is no longer maintained, repo URL need to
change to archive.debian.org, also need to specify
Acquire::Check-Valid-Until=false.

Signed-off-by: Takuya ASADA <syuu@scylladb.com>
Message-Id: <20190327120916.25036-1-syuu@scylladb.com>

SCYLLA-VERSION-GEN

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

dist/debian/apt/apt.conf.d/99jessie-backports

@@ -0,0 +1 @@
+Acquire::Check-Valid-Until "false";

dist/debian/build_deb.sh

@@ -131,19 +131,18 @@ if [ "$TARGET" != "trusty" ]; then
     pystache dist/common/systemd/scylla-jmx.service.mustache "{ $MUSTACHE_DIST }" > debian/scylla-jmx.service
 fi
 
-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 --aptconfdir dist/debian/apt
-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
 elif [ "$TARGET" = "bionic" ]; then
     echo "apt-get install -y ca-certificates-java openjdk-8-jdk-headless" > build/bionic-workaround.sh
     echo "update-ca-certificates -f" >> build/bionic-workaround.sh
     chmod a+rx build/bionic-workaround.sh
-    sudo -E DIST=$TARGET /usr/sbin/pbuilder execute --save-after-exec build/bionic-workaround.sh
+    sudo -E DIST=$TARGET /usr/sbin/pbuilder execute --configfile ./dist/debian/pbuilderrc --save-after-exec build/bionic-workaround.sh
 fi
-sudo -E DIST=$TARGET pdebuild --buildresult build/debs
+sudo -E DIST=$TARGET pdebuild --configfile ./dist/debian/pbuilderrc --buildresult build/debs

dist/debian/pbuilderrc

@@ -18,7 +18,7 @@ elif [ "$DIST" = "jessie" ] || [ "$DIST" = "stretch" ] || [ "$DIST" = "buster" ]
     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"
+        OTHERMIRROR="deb http://archive.debian.org/debian jessie-backports main"
     fi
 else
     echo "Unknown distribution: $DIST"

dist/redhat/build_rpm.sh

@@ -76,5 +76,12 @@ SCYLLA_RELEASE=$(cat build/SCYLLA-RELEASE-FILE)
 git archive --format=tar --prefix=scylla-jmx-$SCYLLA_VERSION/ HEAD -o build/scylla-jmx-$VERSION.tar
 pystache dist/redhat/scylla-jmx.spec.mustache "{ \"version\": \"$SCYLLA_VERSION\", \"release\": \"$SCYLLA_RELEASE\" }" > build/scylla-jmx.spec
 
+# mock generates files owned by root, fix this up
+fix_ownership() {
+    sudo chown "$(id -u):$(id -g)" -R "$@"
+}
+
 sudo mock --buildsrpm --root=$TARGET --resultdir=`pwd`/build/srpms --spec=build/scylla-jmx.spec --sources=build/scylla-jmx-$VERSION.tar
+fix_ownership build/srpms
 sudo mock --rebuild --root=$TARGET --resultdir=`pwd`/build/rpms build/srpms/scylla-jmx-$VERSION*.src.rpm
+fix_ownership build/rpms

src/main/java/com/scylladb/jmx/utils/APIMBeanServer.java

@@ -53,7 +53,16 @@ public class APIMBeanServer implements MBeanServer {
     }
 
     private static ObjectName prepareForRemote(final ObjectName n) {
-        return ObjectName.getInstance(n);
+        /*
+         * ObjectName.getInstance has changed in JDK (micro) updates so it no longer applies 
+         * overridable methods -> wrong name published. 
+         * Fix by doing explicit ObjectName instansiation. 
+         */
+        try {
+            return new ObjectName(n.getCanonicalName());
+        } catch (MalformedObjectNameException e) {
+            throw new IllegalArgumentException(n.toString());
+        }
     }
 
     @Override

src/main/java/org/apache/cassandra/metrics/TableMetrics.java

@@ -267,17 +267,16 @@ public class TableMetrics implements Metrics {
     }
 
     static class TableMetricObjectName extends javax.management.ObjectName {
-        private static final String FAKE_NAME = "a:a=a";
-
         private final TableMetricStringNameFactory factory;
         private final String metricName;
 
         public TableMetricObjectName(TableMetricStringNameFactory factory, String metricName) throws MalformedObjectNameException {
-            super(FAKE_NAME);
+            super("");
             this.factory = factory;
             this.metricName = metricName;
         }
 
+        
         @Override
         public boolean isPropertyValuePattern(String property) {
             return false;
@@ -326,8 +325,7 @@ public class TableMetrics implements Metrics {
         @Override
         public boolean equals(Object o) {
             if (this == o) return true;
-            if (!(o instanceof TableMetricObjectName)) return false;
+            return getCanonicalName().equals(((ObjectName) o).getCanonicalName());
-            return getCanonicalName().equals(((TableMetricObjectName) o).getCanonicalName());
         }
 
         @Override
@@ -342,6 +340,36 @@ public class TableMetrics implements Metrics {
             }
             return getCanonicalName().equals(name.getCanonicalName());
         }
+
+
+        @Override
+        public boolean isPattern() {
+            return false;
+        }
+
+
+        @Override
+        public boolean isDomainPattern() {
+            return false;
+        }
+
+
+        @Override
+        public boolean isPropertyPattern() {
+            return false;
+        }
+
+
+        @Override
+        public boolean isPropertyListPattern() {
+            return false;
+        }
+
+
+        @Override
+        public boolean isPropertyValuePattern() {
+            return false;
+        }
     }
 
     static interface TableMetricStringNameFactory {