Commit 89471e30 authored by Stan Hu's avatar Stan Hu

Fix comparison of storage shards

parent 91c565e1
...@@ -42,7 +42,6 @@ class GeoNodeStatus { ...@@ -42,7 +42,6 @@ class GeoNodeStatus {
this.$advancedStatus.on('click', GeoNodeStatus.toggleShowAdvancedStatus.bind(this)); this.$advancedStatus.on('click', GeoNodeStatus.toggleShowAdvancedStatus.bind(this));
this.primaryVersion = $('.js-primary-version').text(); this.primaryVersion = $('.js-primary-version').text();
this.primaryRevision = $('.js-primary-revision').text().replace(/\W/g, ''); this.primaryRevision = $('.js-primary-revision').text().replace(/\W/g, '');
this.primaryStorageConfiguration = $('.primary-node').data('storageShards');
this.statusInterval = new SmartInterval({ this.statusInterval = new SmartInterval({
callback: this.getStatus.bind(this), callback: this.getStatus.bind(this),
......
...@@ -157,7 +157,7 @@ class GeoNodeStatus < ActiveRecord::Base ...@@ -157,7 +157,7 @@ class GeoNodeStatus < ActiveRecord::Base
def storage_shards_match? def storage_shards_match?
return unless Gitlab::Geo.primary? return unless Gitlab::Geo.primary?
storage_shards.as_json == StorageShard.all.as_json storage_shards.as_json == StorageShardSerializer.new.represent(StorageShard.all).as_json
end end
def [](key) def [](key)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment