Skip to content

Commit cc871e4

Browse files
committed
[refactor] CurveBS: unify bs and fs apply queue
Signed-off-by: Xinlong Chen <xl_chen@zju.edu.cn>
1 parent a8d8268 commit cc871e4

File tree

10 files changed

+34
-582
lines changed

10 files changed

+34
-582
lines changed

.clang-format

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ BasedOnStyle: Google
44
AccessModifierOffset: -3
55
DerivePointerAlignment: false
66
IndentWidth: 4
7-
AlignAfterOpenBracket: DontAlign
87
---
98
Language: Proto
109
BasedOnStyle: Google

curvefs/src/metaserver/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ cc_library(
6464
"//curvefs/src/client:filesystem_xattr",
6565
"//external:braft",
6666
"//src/common:curve_common",
67+
"//src/chunkserver/concurrent_apply:chunkserver_concurrent_apply",
6768
"//src/fs:lfs",
6869
"//curvefs/src/common:dynamic_vlog",
6970
"//curvefs/src/common:threading",

curvefs/src/metaserver/copyset/concurrent_apply_queue.cpp

Lines changed: 0 additions & 198 deletions
This file was deleted.

curvefs/src/metaserver/copyset/concurrent_apply_queue.h

Lines changed: 0 additions & 152 deletions
This file was deleted.

curvefs/src/metaserver/copyset/config.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,17 @@
3131
#include <memory>
3232
#include <string>
3333

34-
#include "curvefs/src/metaserver/copyset/concurrent_apply_queue.h"
3534
#include "curvefs/src/metaserver/copyset/trash.h"
3635
#include "curvefs/src/metaserver/storage/config.h"
36+
#include "src/chunkserver/concurrent_apply/concurrent_apply.h"
3737
#include "src/fs/local_filesystem.h"
3838

3939
namespace curvefs {
4040
namespace metaserver {
4141
namespace copyset {
4242

43+
using ApplyOption = ::curve::chunkserver::concurrent::ConcurrentApplyOption;
44+
4345
// Options for copyset node and relative modules
4446
struct CopysetNodeOptions {
4547
// copyset's data uri

0 commit comments

Comments
 (0)