Compare commits
20 Commits
master
...
branch-3.0
Author | SHA1 | Date | |
---|---|---|---|
|
758bef335f | ||
|
739198ddeb | ||
|
2b9effb1ae | ||
|
b5ed0af1b3 | ||
|
31187720c7 | ||
|
c9dd098ce7 | ||
|
3965bc0e25 | ||
|
d1b1a4134c | ||
|
53ddd3be7c | ||
|
1191757e27 | ||
|
04e7784ad3 | ||
|
8f616e5bc7 | ||
|
be11c2d920 | ||
|
18bf97a7ea | ||
|
f703f64d72 | ||
|
b7ddfc9415 | ||
|
3d3fec0cf6 | ||
|
fd99f65e8a | ||
|
426b88b983 | ||
|
dbb3d44d69 |
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
VERSION=666.development
|
||||
VERSION=3.0.11
|
||||
|
||||
if test -f version
|
||||
then
|
||||
|
1
dist/debian/apt/apt.conf.d/99jessie-backports
vendored
Normal file
1
dist/debian/apt/apt.conf.d/99jessie-backports
vendored
Normal file
@ -0,0 +1 @@
|
||||
Acquire::Check-Valid-Until "false";
|
2
dist/debian/build_deb.sh
vendored
2
dist/debian/build_deb.sh
vendored
@ -141,7 +141,7 @@ fi
|
||||
|
||||
sudo rm -fv /var/cache/pbuilder/$PRODUCT-jmx-$TARGET.tgz
|
||||
sudo PRODUCT=$PRODUCT DIST=$TARGET /usr/sbin/pbuilder clean --configfile ./dist/debian/pbuilderrc
|
||||
sudo PRODUCT=$PRODUCT DIST=$TARGET /usr/sbin/pbuilder create --configfile ./dist/debian/pbuilderrc
|
||||
sudo PRODUCT=$PRODUCT DIST=$TARGET /usr/sbin/pbuilder create --configfile ./dist/debian/pbuilderrc --aptconfdir dist/debian/apt
|
||||
sudo PRODUCT=$PRODUCT 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
|
||||
|
2
dist/debian/pbuilderrc
vendored
2
dist/debian/pbuilderrc
vendored
@ -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"
|
||||
|
@ -152,7 +152,11 @@ public class APIClient {
|
||||
get(path, queryParams).delete();
|
||||
return;
|
||||
}
|
||||
get(path).delete();
|
||||
Response response = get(path).delete();
|
||||
if (response.getStatus() != Response.Status.OK.getStatusCode()) {
|
||||
throw getException("Scylla API server HTTP delete to URL '" + path + "' failed",
|
||||
response.readEntity(String.class));
|
||||
}
|
||||
}
|
||||
|
||||
public void delete(String path) {
|
||||
|
@ -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
|
||||
|
@ -297,17 +297,16 @@ public class TableMetrics implements Metrics {
|
||||
|
||||
@SuppressWarnings("serial")
|
||||
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;
|
||||
@ -356,8 +355,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(((TableMetricObjectName) o).getCanonicalName());
|
||||
return getCanonicalName().equals(((ObjectName) o).getCanonicalName());
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -372,6 +370,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 {
|
||||
|
Loading…
Reference in New Issue
Block a user