Restore original workflow

Signed-off-by: Peter Nied <peternied@hotmail.com>

Author: peternied

server/src/internalClusterTest/java/org/opensearch/snapshots/RestoreSnapshotIT.java

@@ -312,7 +312,7 @@ public void testRestoreWithDifferentMappingsAndSettings() throws Exception {
                 Settings.builder()
                     .put(indexSettings())
                     .put(SETTING_NUMBER_OF_REPLICAS, between(0, 1))
-                    .put("index.mapper.dynamic", true)
+                    // .put("index.mapper.dynamic", true)
                     .put("refresh_interval", 10, TimeUnit.SECONDS)
             )
         );

server/src/main/java/org/opensearch/index/mapper/MapperService.java

@@ -260,9 +260,9 @@ public MapperService(
         this.mapperRegistry = mapperRegistry;
         this.idFieldDataEnabled = idFieldDataEnabled;
 
-        // if (INDEX_MAPPER_DYNAMIC_SETTING.exists(indexSettings.getSettings())) {
-        //     throw new IllegalArgumentException("Setting " + INDEX_MAPPER_DYNAMIC_SETTING.getKey() + " was removed after version 6.0.0");
-        // }
+        if (INDEX_MAPPER_DYNAMIC_SETTING.exists(indexSettings.getSettings())) {
+            throw new IllegalArgumentException("Setting " + INDEX_MAPPER_DYNAMIC_SETTING.getKey() + " was removed after version 6.0.0");
+        }
     }
 
     public boolean hasNested() {