diff options
| -rw-r--r-- | dependency-versions/pom.xml | 2 | ||||
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java | 2 | ||||
| -rw-r--r-- | screwdriver.yaml | 28 |
3 files changed, 2 insertions, 30 deletions
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index b967bfc796a..97b3f69cf5c 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -130,7 +130,7 @@ <prometheus.client.vespa.version>0.16.0</prometheus.client.vespa.version> <plexus-interpolation.vespa.version>1.27</plexus-interpolation.vespa.version> <protobuf.vespa.version>3.25.2</protobuf.vespa.version> - <questdb.vespa.version>7.3.7</questdb.vespa.version> + <questdb.vespa.version>7.3.9</questdb.vespa.version> <spifly.vespa.version>1.3.7</spifly.vespa.version> <spotbugs.vespa.version>4.8.3</spotbugs.vespa.version> <!-- Must match major version in https://github.com/apache/zookeeper/blob/master/pom.xml --> <snappy.vespa.version>1.1.10.5</snappy.vespa.version> diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java index 4d0bbb4e511..e9230d2c91a 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java @@ -431,7 +431,7 @@ public class QuestMetricsDb extends AbstractComponent implements MetricsDb { try { issueAsync("alter table " + name + " drop partition where at < dateadd('d', -4, now());", newContext()); } - catch (SqlException e) { + catch (Exception e) { if (e.getMessage().contains("no partitions matched WHERE clause")) return; log.log(Level.WARNING, "Failed to gc old metrics data in " + dir + " table " + name, e); } diff --git a/screwdriver.yaml b/screwdriver.yaml index 2fc0509db06..1a3bada2c42 100644 --- a/screwdriver.yaml +++ b/screwdriver.yaml @@ -537,34 +537,6 @@ jobs: - cleanup: | screwdriver/delete-old-cloudsmith-artifacts.sh - mirror-copr-rpms-to-artifactory: - image: docker.io/almalinux:8 - annotations: - screwdriver.cd/cpu: LOW - screwdriver.cd/ram: LOW - screwdriver.cd/disk: HIGH - screwdriver.cd/timeout: 60 - screwdriver.cd/buildPeriodically: H 6 * * * - secrets: - - JFROG_API_TOKEN - steps: - - install: | - dnf install -y dnf-plugins-core - - mirror: | - screwdriver/publish-unpublished-rpms-to-jfrog-cloud.sh - - delete-old-versions-on-artifactory: - annotations: - screwdriver.cd/cpu: LOW - screwdriver.cd/ram: LOW - screwdriver.cd/timeout: 10 - screwdriver.cd/buildPeriodically: H 6 * * 1 - secrets: - - JFROG_API_TOKEN - steps: - - cleanup: | - screwdriver/delete-old-artifactory-artifacts.sh - link-check: image: ruby:3.1 annotations: |