Fix repeated error save loops in File Settings Service (#90271)

elastic · Sep 23, 2022 · 6af2b5c · 6af2b5c
1 parent 1acc278
commit 6af2b5c
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 4 deletions.
diff --git a/docs/changelog/90271.yaml b/docs/changelog/90271.yaml
@@ -0,0 +1,6 @@
+pr: 90271
+summary: Fix repeated error save loops in File Settings Service
+area: Infra/Core
+type: bug
+issues:
+ - 90222
diff --git a/server/src/main/java/org/elasticsearch/bootstrap/Security.java b/server/src/main/java/org/elasticsearch/bootstrap/Security.java
@@ -46,6 +46,8 @@
 import static java.lang.invoke.MethodType.methodType;
 import static org.elasticsearch.bootstrap.FilePermissionUtils.addDirectoryPath;
 import static org.elasticsearch.bootstrap.FilePermissionUtils.addSingleFilePath;
+import static org.elasticsearch.reservedstate.service.FileSettingsService.OPERATOR_DIRECTORY;
+import static org.elasticsearch.reservedstate.service.FileSettingsService.SETTINGS_FILE_NAME;
 
 /**
  * Initializes SecurityManager with necessary permissions.
@@ -253,6 +255,8 @@ static void addFilePermissions(Permissions policy, Environment environment, Path
             // we just need permission to remove the file if its elsewhere.
             addSingleFilePath(policy, pidFile, "delete");
         }
+        // we need to touch the operator/settings.json file when restoring from snapshots, on some OSs it needs file write permission
+        addSingleFilePath(policy, environment.configFile().resolve(OPERATOR_DIRECTORY).resolve(SETTINGS_FILE_NAME), "read,readlink,write");
     }
 
     /**

diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/ReservedStateMetadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/ReservedStateMetadata.java
@@ -209,7 +209,7 @@ public static class Builder {
          */
         public Builder(String namespace) {
             this.namespace = namespace;
-            this.version = 0L;
+            this.version = -1L;
             this.handlers = new HashMap<>();
             this.errorMetadata = null;
         }

diff --git a/server/src/main/java/org/elasticsearch/reservedstate/service/FileSettingsService.java b/server/src/main/java/org/elasticsearch/reservedstate/service/FileSettingsService.java
@@ -50,7 +50,7 @@
 public class FileSettingsService extends AbstractLifecycleComponent implements ClusterStateListener {
     private static final Logger logger = LogManager.getLogger(FileSettingsService.class);
 
-    private static final String SETTINGS_FILE_NAME = "settings.json";
+    public static final String SETTINGS_FILE_NAME = "settings.json";
     public static final String NAMESPACE = "file_settings";
 
     private final ClusterService clusterService;

diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ReservedStateMetadataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ReservedStateMetadataTests.java
@@ -75,6 +75,11 @@ public void testXContent() throws IOException {
         xContentTest(false, false);
     }
 
+    public void testReservedStateVersionWithError() {
+        final ReservedStateMetadata meta = createRandom(false, true);
+        assertEquals(-1L, meta.version().longValue());
+    }
+
     private static ReservedStateMetadata createRandom(boolean addHandlers, boolean addErrors) {
         List<ReservedStateHandlerMetadata> handlers = randomList(
             0,

diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetadataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetadataTests.java
@@ -782,7 +782,7 @@ public void testToXContentAPIReservedMetadata() throws IOException {
                 },
                 "reserved_state" : {
                   "namespace_one" : {
-                    "version" : 0,
+                    "version" : -1,
                     "handlers" : {
                       "one" : {
                         "keys" : [
@@ -807,7 +807,7 @@ public void testToXContentAPIReservedMetadata() throws IOException {
                     }
                   },
                   "namespace_two" : {
-                    "version" : 0,
+                    "version" : -1,
                     "handlers" : {
                       "three" : {
                         "keys" : [