fix elastic#81697

jloleysens · Oct 27, 2020 · 28dffcf · 28dffcf
1 parent f475d02
commit 28dffcf
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 0 deletions.
diff --git a/...k/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/constants.ts b/...k/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/constants.ts
@@ -30,6 +30,31 @@ export const DEFAULT_POLICY: PolicyFromES = {
   name: 'my_policy',
 };
 
+export const POLICY_WITH_MIGRATE_OFF: PolicyFromES = {
+  version: 1,
+  modified_date: Date.now().toString(),
+  policy: {
+    name: 'my_policy',
+    phases: {
+      hot: {
+        min_age: '0ms',
+        actions: {
+          rollover: {
+            max_age: '30d',
+            max_size: '50gb',
+          },
+        },
+      },
+      warm: {
+        actions: {
+          migrate: { enabled: false },
+        },
+      },
+    },
+  },
+  name: 'my_policy',
+};
+
 export const POLICY_WITH_INCLUDE_EXCLUDE: PolicyFromES = {
   version: 1,
   modified_date: Date.now().toString(),

diff --git a/...ns/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.test.ts b/...ns/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.test.ts
@@ -15,6 +15,7 @@ import {
   NEW_SNAPSHOT_POLICY_NAME,
   SNAPSHOT_POLICY_NAME,
   DEFAULT_POLICY,
+  POLICY_WITH_MIGRATE_OFF,
   POLICY_WITH_INCLUDE_EXCLUDE,
   POLICY_WITH_NODE_ATTR_AND_OFF_ALLOCATION,
   POLICY_WITH_NODE_ROLE_ALLOCATION,
@@ -457,6 +458,33 @@ describe('<EditPolicy />', () => {
   });
 
   describe('data allocation', () => {
+    beforeEach(async () => {
+      httpRequestsMockHelpers.setLoadPolicies([POLICY_WITH_MIGRATE_OFF]);
+      httpRequestsMockHelpers.setListNodes({
+        nodesByRoles: {},
+        nodesByAttributes: { test: ['123'] },
+        isUsingDeprecatedDataRoleConfig: false,
+      });
+      httpRequestsMockHelpers.setLoadSnapshotPolicies([]);
+
+      await act(async () => {
+        testBed = await setup();
+      });
+
+      const { component } = testBed;
+      component.update();
+    });
+
+    test('setting node_attr based allocation, but not selecting node attribute', async () => {
+      const { actions } = testBed;
+      await actions.warm.setDataAllocation('node_attrs');
+      await actions.savePolicy();
+      const latestRequest = server.requests[server.requests.length - 1];
+      const warmPhase = JSON.parse(JSON.parse(latestRequest.requestBody).body).phases.warm;
+
+      expect(warmPhase.actions.migrate).toEqual({ enabled: false });
+    });
+
     describe('node roles', () => {
       beforeEach(async () => {
         httpRequestsMockHelpers.setLoadPolicies([POLICY_WITH_NODE_ROLE_ALLOCATION]);

diff --git a/.../plugins/index_lifecycle_management/public/application/sections/edit_policy/serializer.ts b/.../plugins/index_lifecycle_management/public/application/sections/edit_policy/serializer.ts
@@ -31,6 +31,11 @@ const serializeAllocateAction = (
             [name]: value,
           },
         };
+      } else {
+        // The form has been configured to use node attribute based allocation but no node attribute
+        // was selected. We fall back to what was originally selected in this case. This might be
+        // migrate.enabled: "false"
+        actions.migrate = originalActions.migrate;
       }
 
       // copy over the original include and exclude values until we can set them in the form.