Merge PR ceph#21992 into master

* refs/pull/21992/head: qa: extend timeout for SessionMap flush Reviewed-by: John Spray <[email protected]>
blmt · Sep 16, 2018 · ea43ce7 · ea43ce7
2 parents 28d9982 + 644a535
commit ea43ce7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/qa/tasks/cephfs/test_sessionmap.py b/qa/tasks/cephfs/test_sessionmap.py
@@ -145,10 +145,10 @@ def get_omap_wrs():
         # a single session get written out (the first of the two, triggered by the second getting marked
         # dirty)
         # The number of writes is two per session, because the header (sessionmap version) update and
-        # KV write both count.
+        # KV write both count. Also, multiply by 2 for each openfile table update.
         self.wait_until_true(
-            lambda: get_omap_wrs() - initial_omap_wrs == 2,
-            timeout=10  # Long enough for an export to get acked
+            lambda: get_omap_wrs() - initial_omap_wrs == 2*2,
+            timeout=30  # Long enough for an export to get acked
         )
 
         # Now end our sessions and check the backing sessionmap is updated correctly