From: Sage Weil <sage@redhat.com>
Date: Wed, 28 Nov 2018 17:34:57 +0000 (-0600)
Subject: Merge PR #25272 into master
X-Git-Tag: v14.1.0~776
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=706197a7c7ea0c9f780712e640093f0fc64f1fce;p=ceph.git

Merge PR #25272 into master

* refs/pull/25272/head:
	qa: add simple test-volumes.sh workunit and run it from fs/basic_functional
	vstart.sh: create default fs via 'fs volume create'
	mgr/volumes: fix oremote
	mon/MgrMonitor: enable volumes module by default
	mgr: create `volumes` module
	mgr: cleaner constructor for CommandResult
	mgr: block for latest osdmap after command execution
	mgr: add MgrModule.mon_command helper
	ceph_volume_client: enable using existing rados inst
	mon: give ceph-mgr access to 'fs' commands

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
---

706197a7c7ea0c9f780712e640093f0fc64f1fce
diff --cc src/pybind/mgr/mgr_module.py
index b80accdd5824,3a60dff93351..5d582039aeda
--- a/src/pybind/mgr/mgr_module.py
+++ b/src/pybind/mgr/mgr_module.py
@@@ -5,10 -6,11 +6,11 @@@ import jso
  import six
  import threading
  try:
 -    from collections.abc import defaultdict
 +    from collections.abc import defaultdict, namedtuple
  except ImportError:
 -    from collections import defaultdict
 +    from collections import defaultdict, namedtuple
  import rados
+ import time
  
  PG_STATES = [
          "active",