Merge remote-tracking branch 'origin/main' into pluggable-shards-avai…

…lability-indicator
dakrone · Oct 26, 2023 · 827ab5c · 827ab5c
2 parents aee12a1 + 328ebc4
commit 827ab5c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/distribution/docker/build.gradle b/distribution/docker/build.gradle
@@ -407,7 +407,7 @@ void addBuildDockerImageTask(Architecture architecture, DockerBase base) {
       if (base == DockerBase.IRON_BANK) {
         Map<String, String> buildArgsMap = [
           'BASE_REGISTRY': 'docker.elastic.co',
-          'BASE_IMAGE'   : 'ubi8/ubi',
+          'BASE_IMAGE'   : 'ubi9/ubi',
           'BASE_TAG'     : 'latest'
         ]
 

diff --git a/distribution/docker/src/docker/Dockerfile b/distribution/docker/src/docker/Dockerfile
@@ -21,8 +21,8 @@
 
 <% if (docker_base == 'iron_bank') { %>
 ARG BASE_REGISTRY=registry1.dso.mil
-ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
-ARG BASE_TAG=8.6
+ARG BASE_IMAGE=redhat/ubi/ubi9
+ARG BASE_TAG=9.2
 <% } %>
 
 ################################################################################

diff --git a/distribution/docker/src/docker/iron_bank/hardening_manifest.yaml b/distribution/docker/src/docker/iron_bank/hardening_manifest.yaml
@@ -13,8 +13,8 @@ tags:
 
 # Build args passed to Dockerfile ARGs
 args:
-  BASE_IMAGE: "redhat/ubi/ubi8"
-  BASE_TAG: "8.6"
+  BASE_IMAGE: "redhat/ubi/ubi9"
+  BASE_TAG: "9.2"
 
 # Docker image labels
 labels:

diff --git a/docs/changelog/101346.yaml b/docs/changelog/101346.yaml
@@ -0,0 +1,5 @@
+pr: 101346
+summary: Report full stack trace for non-state file settings transforms
+area: Infra/Settings
+type: bug
+issues: []
diff --git a/...er/src/main/java/org/elasticsearch/reservedstate/service/ReservedClusterStateService.java b/...er/src/main/java/org/elasticsearch/reservedstate/service/ReservedClusterStateService.java
@@ -239,7 +239,7 @@ public void onFailure(Exception e) {
             @Override
             public void onFailure(Exception e) {
                 // If we encounter an error while runnin the non-state transforms, we avoid saving any cluster state.
-                errorListener.accept(checkAndReportError(namespace, List.of(e.getMessage()), reservedStateVersion));
+                errorListener.accept(checkAndReportError(namespace, List.of(stackTrace(e)), reservedStateVersion));
             }
         });
     }