Merge branch 'wip-18070' into wip-mgolub-testing

rbd-nbd: restart parent process logger after forking #12222
ceph · Nov 30, 2016 · 8864707 · 8864707
2 parents dbe879c + 29baf25
commit 8864707
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc
@@ -493,8 +493,9 @@ static int do_map()
     }
 
     if (forker.is_parent()) {
+      global_init_postfork_start(g_ceph_context);
       if (forker.parent_wait(err) != 0) {
-	return -ENXIO;
+        return -ENXIO;
       }
       return 0;
     }