From: Jason Dillaman Date: Thu, 1 Mar 2018 20:00:57 +0000 (-0500) Subject: rbd-mirror: corrected implicitly included dout header X-Git-Tag: v13.0.2~31^2~5 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c9e35cfaad950829641a2acc72a34634a31000b4;p=ceph.git rbd-mirror: corrected implicitly included dout header Signed-off-by: Jason Dillaman --- diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc index c46f15ffdd9..482f5e073f7 100644 --- a/src/tools/rbd_mirror/ImageReplayer.cc +++ b/src/tools/rbd_mirror/ImageReplayer.cc @@ -3,6 +3,7 @@ #include "include/compat.h" #include "common/Formatter.h" +#include "common/admin_socket.h" #include "common/debug.h" #include "common/errno.h" #include "include/stringify.h" diff --git a/src/tools/rbd_mirror/ImageSync.cc b/src/tools/rbd_mirror/ImageSync.cc index 9e703ccbfe8..60132c2fe09 100644 --- a/src/tools/rbd_mirror/ImageSync.cc +++ b/src/tools/rbd_mirror/ImageSync.cc @@ -4,6 +4,7 @@ #include "ImageSync.h" #include "InstanceWatcher.h" #include "ProgressContext.h" +#include "common/debug.h" #include "common/Timer.h" #include "common/errno.h" #include "journal/Journaler.h" diff --git a/src/tools/rbd_mirror/image_deleter/RemoveRequest.cc b/src/tools/rbd_mirror/image_deleter/RemoveRequest.cc index 6f10dd99ecd..772333f9f96 100644 --- a/src/tools/rbd_mirror/image_deleter/RemoveRequest.cc +++ b/src/tools/rbd_mirror/image_deleter/RemoveRequest.cc @@ -3,7 +3,7 @@ #include "tools/rbd_mirror/image_deleter/RemoveRequest.h" #include "include/assert.h" -#include "common/dout.h" +#include "common/debug.h" #include "common/errno.h" #include "common/WorkQueue.h" #include "cls/rbd/cls_rbd_client.h" diff --git a/src/tools/rbd_mirror/image_deleter/SnapshotPurgeRequest.cc b/src/tools/rbd_mirror/image_deleter/SnapshotPurgeRequest.cc index 797dbdb9059..d6aebeb56b3 100644 --- a/src/tools/rbd_mirror/image_deleter/SnapshotPurgeRequest.cc +++ b/src/tools/rbd_mirror/image_deleter/SnapshotPurgeRequest.cc @@ -2,6 +2,7 @@ // vim: ts=8 sw=2 smarttab #include "tools/rbd_mirror/image_deleter/SnapshotPurgeRequest.h" +#include "common/debug.h" #include "common/errno.h" #include "librbd/ExclusiveLock.h" #include "librbd/ImageCtx.h" diff --git a/src/tools/rbd_mirror/image_replayer/CloseImageRequest.cc b/src/tools/rbd_mirror/image_replayer/CloseImageRequest.cc index 234fded69ee..5b7548230db 100644 --- a/src/tools/rbd_mirror/image_replayer/CloseImageRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/CloseImageRequest.cc @@ -2,7 +2,7 @@ // vim: ts=8 sw=2 smarttab #include "CloseImageRequest.h" -#include "common/dout.h" +#include "common/debug.h" #include "common/errno.h" #include "common/WorkQueue.h" #include "librbd/ImageCtx.h" diff --git a/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc b/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc index a329d22a6e4..bc7b516896a 100644 --- a/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc @@ -4,6 +4,7 @@ #include "CreateImageRequest.h" #include "CloseImageRequest.h" #include "OpenImageRequest.h" +#include "common/debug.h" #include "common/errno.h" #include "common/WorkQueue.h" #include "cls/rbd/cls_rbd_client.h" diff --git a/src/tools/rbd_mirror/image_replayer/GetMirrorImageIdRequest.cc b/src/tools/rbd_mirror/image_replayer/GetMirrorImageIdRequest.cc index a6a72b473f3..1a7b4bca33c 100644 --- a/src/tools/rbd_mirror/image_replayer/GetMirrorImageIdRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/GetMirrorImageIdRequest.cc @@ -4,6 +4,7 @@ #include "tools/rbd_mirror/image_replayer/GetMirrorImageIdRequest.h" #include "include/rados/librados.hpp" #include "cls/rbd/cls_rbd_client.h" +#include "common/debug.h" #include "common/errno.h" #include "librbd/ImageCtx.h" #include "librbd/Utils.h" diff --git a/src/tools/rbd_mirror/image_replayer/IsPrimaryRequest.cc b/src/tools/rbd_mirror/image_replayer/IsPrimaryRequest.cc index f2faa9f20f2..ef2008b9994 100644 --- a/src/tools/rbd_mirror/image_replayer/IsPrimaryRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/IsPrimaryRequest.cc @@ -2,6 +2,7 @@ // vim: ts=8 sw=2 smarttab #include "IsPrimaryRequest.h" +#include "common/debug.h" #include "common/errno.h" #include "common/WorkQueue.h" #include "cls/rbd/cls_rbd_client.h" diff --git a/src/tools/rbd_mirror/image_replayer/OpenImageRequest.cc b/src/tools/rbd_mirror/image_replayer/OpenImageRequest.cc index efba012731b..54b95587f40 100644 --- a/src/tools/rbd_mirror/image_replayer/OpenImageRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/OpenImageRequest.cc @@ -2,6 +2,7 @@ // vim: ts=8 sw=2 smarttab #include "OpenImageRequest.h" +#include "common/debug.h" #include "common/errno.h" #include "librbd/ImageCtx.h" #include "librbd/ImageState.h" diff --git a/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc b/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc index 604cfd453ba..1894905fca1 100644 --- a/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/OpenLocalImageRequest.cc @@ -5,6 +5,7 @@ #include "CloseImageRequest.h" #include "IsPrimaryRequest.h" #include "OpenLocalImageRequest.h" +#include "common/debug.h" #include "common/errno.h" #include "common/WorkQueue.h" #include "librbd/ExclusiveLock.h" diff --git a/src/tools/rbd_mirror/image_replayer/PrepareLocalImageRequest.cc b/src/tools/rbd_mirror/image_replayer/PrepareLocalImageRequest.cc index 4009dc10d4a..a86d982ba31 100644 --- a/src/tools/rbd_mirror/image_replayer/PrepareLocalImageRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/PrepareLocalImageRequest.cc @@ -4,6 +4,7 @@ #include "tools/rbd_mirror/image_replayer/PrepareLocalImageRequest.h" #include "include/rados/librados.hpp" #include "cls/rbd/cls_rbd_client.h" +#include "common/debug.h" #include "common/errno.h" #include "librbd/ImageCtx.h" #include "librbd/Journal.h" diff --git a/src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.cc b/src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.cc index 30688c11ede..0303db1ff70 100644 --- a/src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.cc @@ -4,6 +4,7 @@ #include "tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.h" #include "include/rados/librados.hpp" #include "cls/rbd/cls_rbd_client.h" +#include "common/debug.h" #include "common/errno.h" #include "common/WorkQueue.h" #include "journal/Journaler.h" diff --git a/src/tools/rbd_mirror/image_sync/SyncPointCreateRequest.cc b/src/tools/rbd_mirror/image_sync/SyncPointCreateRequest.cc index 45e1a35ddca..82c2e19b2fa 100644 --- a/src/tools/rbd_mirror/image_sync/SyncPointCreateRequest.cc +++ b/src/tools/rbd_mirror/image_sync/SyncPointCreateRequest.cc @@ -3,6 +3,7 @@ #include "SyncPointCreateRequest.h" #include "include/uuid.h" +#include "common/debug.h" #include "common/errno.h" #include "journal/Journaler.h" #include "librbd/ImageCtx.h" diff --git a/src/tools/rbd_mirror/image_sync/SyncPointPruneRequest.cc b/src/tools/rbd_mirror/image_sync/SyncPointPruneRequest.cc index d4978663aa4..78589d983e7 100644 --- a/src/tools/rbd_mirror/image_sync/SyncPointPruneRequest.cc +++ b/src/tools/rbd_mirror/image_sync/SyncPointPruneRequest.cc @@ -2,6 +2,7 @@ // vim: ts=8 sw=2 smarttab #include "SyncPointPruneRequest.h" +#include "common/debug.h" #include "common/errno.h" #include "journal/Journaler.h" #include "librbd/ImageCtx.h"