Merge pull request #18730 from shinobu-x/wip-luminous-22030

luminous: List of filesystems does not get refreshed after a filesystem deletion

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

diff --cc src/mds/FSMap.h
Simple merge

diff --cc src/pybind/mgr/dashboard/filesystem.html
index 60a97a007d7628967174261be927d8637a77cc2e,f58e9e40aad273b6a9aec1d13577b3f984f6fa20..b93e1f62a9e4f225d87cb9968e79ead83689291a
--- 1/src/pybind/mgr/dashboard/filesystem.html
--- 2/src/pybind/mgr/dashboard/filesystem.html
+++ b/src/pybind/mgr/dashboard/filesystem.html
@@@ -8,9 -8,13 +8,13 @@@
              var content_data = {{ content_data }};
  
              var refresh = function() {
 -                $.get("/filesystem_data/" + content_data.fs_status.filesystem.id  + "/", function(data) {
 +                $.get("{{ url_prefix }}/filesystem_data/" + content_data.fs_status.filesystem.id  + "/", function(data) {
                      _.extend(content_data.fs_status, data);
                      setTimeout(refresh, 5000);
+                 }).fail(function() {
+                     // Perhaps the filesystem we're viewing no longer exists.
+                     // Go back to home.
+                     window.location.href = "{{ url_prefix }}/";
                  });
              };
  

diff --cc src/pybind/mgr/dashboard/module.py
Simple merge