git wip - fetch replication reindx status

hashicorp · Apr 29, 2020 · f414d8d · f414d8d
1 parent 97f272e
commit f414d8d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/ui/app/adapters/cluster.js b/ui/app/adapters/cluster.js
@@ -46,8 +46,9 @@ export default ApplicationAdapter.extend({
     };
     if (this.get('version.isEnterprise') && this.get('namespaceService.inRootNamespace')) {
       fetches.replicationStatus = this.replicationStatus().catch(e => e);
+      fetches.replicationModeStatus = this.replicationModeStatus().catch(e => e);
     }
-    return hash(fetches).then(({ health, sealStatus, replicationStatus }) => {
+    return hash(fetches).then(({ health, sealStatus, replicationStatus, replicationModeStatus }) => {
       let ret = {
         id,
         name: snapshot.attr('name'),
@@ -57,6 +58,11 @@ export default ApplicationAdapter.extend({
         ret = assign(ret, { nodes: [sealStatus] });
       }
       if (replicationStatus && replicationStatus instanceof AdapterError === false) {
+        console.log(replicationModeStatus.data.reindex_stage, ' - reindex stage');
+        console.log(replicationModeStatus.data.reindex_building_progress, ' - build progress');
+        console.log(replicationModeStatus.data.reindex_building_total, ' - build total');
+        console.log(replicationModeStatus.data.reindex_in_progress, ' - reindex in progress?');
+
         ret = assign(ret, replicationStatus.data);
       }
       return resolve(ret);
@@ -174,6 +180,10 @@ export default ApplicationAdapter.extend({
     return this.ajax(`${this.buildURL()}/replication/status`, 'GET', { unauthenticated: true });
   },
 
+  replicationModeStatus() {
+    return this.ajax(`${this.buildURL()}/replication/performance/status`, 'GET', { unauthenticated: true });
+  },
+
   replicationDrPromote(data, options) {
     const verb = options && options.checkStatus ? 'GET' : 'PUT';
     return this.ajax(`${this.buildURL()}/replication/dr/secondary/promote`, verb, {

diff --git a/ui/lib/core/addon/mixins/replication-actions.js b/ui/lib/core/addon/mixins/replication-actions.js
@@ -28,7 +28,6 @@ export default Mixin.create({
       }, {});
       delete data.replicationMode;
     }
-
     return yield this.save.perform(action, replicationMode, clusterMode, data);
   }),
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,6 @@ export default Mixin.create({ @@
           }, {});
           delete data.replicationMode;
         }
         return yield this.save.perform(action, replicationMode, clusterMode, data);
       }),
@@ Expand Down @@