Skip to content

Commit

Permalink
[style] clean up some warnings
Browse files Browse the repository at this point in the history 
Signed-off-by: MizukiCry <[email protected]>
  • Loading branch information
@MizukiCry
MizukiCry committed Apr 10, 2023
1 parent 748709e commit 8faca0e
Show file tree
Hide file tree
Showing 19 changed files with 165 additions and 165 deletions.
2 changes: 2 additions & 0 deletions curvefs/src/client/fuse_client.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ void GetDentryParamFromInodeAttr(

CURVEFS_ERROR FuseClient::FuseOpLookup(fuse_req_t req, fuse_ino_t parent,
const char *name, fuse_entry_param *e) {
(void)req;
VLOG(1) << "FuseOpLookup parent: " << parent
<< ", name: " << name;
if (strlen(name) > option_.maxNameLength) {
Expand Down Expand Up @@ -937,6 +938,7 @@ CURVEFS_ERROR FuseClient::FuseOpReadDirPlus(fuse_req_t req, fuse_ino_t ino,
CURVEFS_ERROR FuseClient::FuseOpRename(fuse_req_t req, fuse_ino_t parent,
const char *name, fuse_ino_t newparent,
const char *newname) {
(void)req;
VLOG(1) << "FuseOpRename from (" << parent << ", " << name << ") to ("
<< newparent << ", " << newname << ")";
if (strlen(name) > option_.maxNameLength ||
Expand Down
4 changes: 2 additions & 2 deletions curvefs/src/client/fuse_client.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ class FuseClient {
dirBuf_(std::make_shared<DirBuffer>()),
fsInfo_(nullptr),
mdsBase_(nullptr),
isStop_(true),
init_(false),
isStop_(true),
enableSumInDir_(false),
warmupManager_(nullptr) {}

Expand All @@ -113,8 +113,8 @@ class FuseClient {
dirBuf_(std::make_shared<DirBuffer>()),
fsInfo_(nullptr),
mdsBase_(nullptr),
isStop_(true),
init_(false),
isStop_(true),
enableSumInDir_(false),
warmupManager_(warmupManager) {}

Expand Down
79 changes: 45 additions & 34 deletions curvefs/src/client/rpcclient/mds_client.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ namespace curvefs {
namespace client {
namespace rpcclient {

using ::curvefs::common::LatencyUpdater;
using ::curvefs::mds::space::SpaceErrCode;
using ::curvefs::mds::space::SpaceErrCode_Name;
using ::curvefs::common::LatencyUpdater;

FSStatusCode
MdsClientImpl::Init(const ::curve::client::MetaServerOption &mdsOpt,
Expand All @@ -53,10 +53,11 @@ MdsClientImpl::Init(const ::curve::client::MetaServerOption &mdsOpt,
}

#define RPCTask \
[&](brpc::Channel * channel, brpc::Controller * cntl) -> int // NOLINT
[&](int addrindex, uint64_t rpctimeoutMS, brpc::Channel *channel, \
brpc::Controller *cntl) -> int

FSStatusCode MdsClientImpl::MountFs(const std::string &fsName,
const Mountpoint &mountPt, FsInfo *fsInfo) {
FSStatusCode MdsClientImpl::MountFs(const std::string& fsName,
const Mountpoint& mountPt, FsInfo* fsInfo) {
auto task = RPCTask {
mdsClientMetric_.mountFs.qps.count << 1;
LatencyUpdater updater(&mdsClientMetric_.mountFs.latency);
Expand Down Expand Up @@ -84,8 +85,8 @@ FSStatusCode MdsClientImpl::MountFs(const std::string &fsName,
return ReturnError(rpcexcutor_.DoRPCTask(task, mdsOpt_.mdsMaxRetryMS));
}

FSStatusCode MdsClientImpl::UmountFs(const std::string &fsName,
const Mountpoint &mountPt) {
FSStatusCode MdsClientImpl::UmountFs(const std::string& fsName,
const Mountpoint& mountPt) {
auto task = RPCTask {
mdsClientMetric_.umountFs.qps.count << 1;
LatencyUpdater updater(&mdsClientMetric_.umountFs.latency);
Expand Down Expand Up @@ -413,7 +414,7 @@ bool MdsClientImpl::ListPartition(uint32_t fsID,
}

bool MdsClientImpl::AllocOrGetMemcacheCluster(uint32_t fsId,
MemcacheClusterInfo *cluster) {
MemcacheClusterInfo* cluster) {
auto task = RPCTask {
mdsClientMetric_.allocOrGetMemcacheCluster.qps.count << 1;
LatencyUpdater updater(
Expand Down Expand Up @@ -476,8 +477,8 @@ FSStatusCode MdsClientImpl::AllocS3ChunkId(uint32_t fsId, uint32_t idNum,
FSStatusCode
MdsClientImpl::RefreshSession(const std::vector<PartitionTxId> &txIds,
std::vector<PartitionTxId> *latestTxIdList,
const std::string &fsName,
const Mountpoint &mountpoint) {
const std::string& fsName,
const Mountpoint& mountpoint) {
auto task = RPCTask {
mdsClientMetric_.refreshSession.qps.count << 1;
LatencyUpdater updater(&mdsClientMetric_.refreshSession.latency);
Expand Down Expand Up @@ -513,8 +514,8 @@ MdsClientImpl::RefreshSession(const std::vector<PartitionTxId> &txIds,
return ReturnError(rpcexcutor_.DoRPCTask(task, mdsOpt_.mdsMaxRetryMS));
}

FSStatusCode MdsClientImpl::GetLatestTxId(const GetLatestTxIdRequest &request,
GetLatestTxIdResponse *response) {
FSStatusCode MdsClientImpl::GetLatestTxId(const GetLatestTxIdRequest& request,
GetLatestTxIdResponse* response) {
auto task = RPCTask {
VLOG(3) << "GetLatestTxId [request]: " << request.DebugString();
mdsClientMetric_.getLatestTxId.qps.count << 1;
Expand Down Expand Up @@ -549,7 +550,7 @@ FSStatusCode MdsClientImpl::GetLatestTxId(const GetLatestTxIdRequest &request,
return ReturnError(rpcexcutor_.DoRPCTask(task, 0));
}

FSStatusCode MdsClientImpl::CommitTx(const CommitTxRequest &request) {
FSStatusCode MdsClientImpl::CommitTx(const CommitTxRequest& request) {
auto task = RPCTask {
VLOG(3) << "CommitTx [request]: " << request.DebugString();
mdsClientMetric_.commitTx.qps.count << 1;
Expand Down Expand Up @@ -584,20 +585,23 @@ FSStatusCode MdsClientImpl::CommitTx(const CommitTxRequest &request) {
}

FSStatusCode MdsClientImpl::GetLatestTxId(uint32_t fsId,
std::vector<PartitionTxId> *txIds) {
std::vector<PartitionTxId>* txIds) {
GetLatestTxIdRequest request;
GetLatestTxIdResponse response;
request.set_fsid(fsId);
FSStatusCode rc = GetLatestTxId(request, &response);
if (rc == FSStatusCode::OK) {
*txIds = {response.txids().begin(), response.txids().end()};
*txIds = { response.txids().begin(), response.txids().end() };
}
return rc;
}

FSStatusCode MdsClientImpl::GetLatestTxIdWithLock(
uint32_t fsId, const std::string &fsName, const std::string &uuid,
std::vector<PartitionTxId> *txIds, uint64_t *txSequence) {
uint32_t fsId,
const std::string& fsName,
const std::string& uuid,
std::vector<PartitionTxId>* txIds,
uint64_t* txSequence) {
GetLatestTxIdRequest request;
GetLatestTxIdResponse response;
request.set_lock(true);
Expand All @@ -606,28 +610,30 @@ FSStatusCode MdsClientImpl::GetLatestTxIdWithLock(
request.set_uuid(uuid);
FSStatusCode rc = GetLatestTxId(request, &response);
if (rc == FSStatusCode::OK) {
*txIds = {response.txids().begin(), response.txids().end()};
*txIds = { response.txids().begin(), response.txids().end() };
*txSequence = response.txsequence();
}
return rc;
}

FSStatusCode MdsClientImpl::CommitTx(const std::vector<PartitionTxId> &txIds) {
FSStatusCode MdsClientImpl::CommitTx(
const std::vector<PartitionTxId>& txIds) {
CommitTxRequest request;
*request.mutable_partitiontxids() = {txIds.begin(), txIds.end()};
*request.mutable_partitiontxids() = { txIds.begin(), txIds.end() };
return CommitTx(request);
}

FSStatusCode
MdsClientImpl::CommitTxWithLock(const std::vector<PartitionTxId> &txIds,
const std::string &fsName,
const std::string &uuid, uint64_t sequence) {
FSStatusCode MdsClientImpl::CommitTxWithLock(
const std::vector<PartitionTxId>& txIds,
const std::string& fsName,
const std::string& uuid,
uint64_t sequence) {
CommitTxRequest request;
request.set_lock(true);
request.set_fsname(fsName);
request.set_uuid(uuid);
request.set_txsequence(sequence);
*request.mutable_partitiontxids() = {txIds.begin(), txIds.end()};
*request.mutable_partitiontxids() = { txIds.begin(), txIds.end() };
return CommitTx(request);
}

Expand All @@ -649,17 +655,19 @@ static SpaceErrCode ToSpaceErrCode(int err) {
return static_cast<SpaceErrCode>(err);
}

#define CHECK_RPC_AND_RETRY_IF_ERROR(msg) \
do { \
if (cntl->Failed()) { \
LOG(WARNING) << msg << " failed, error: " << cntl->ErrorText() \
<< ", log id: " << cntl->log_id(); \
return -cntl->ErrorCode(); \
} \
#define CHECK_RPC_AND_RETRY_IF_ERROR(msg) \
do { \
if (cntl->Failed()) { \
LOG(WARNING) << msg << " failed, error: " << cntl->ErrorText() \
<< ", log id: " << cntl->log_id(); \
return -cntl->ErrorCode(); \
} \
} while (0)

SpaceErrCode MdsClientImpl::AllocateVolumeBlockGroup(
uint32_t fsId, uint32_t count, const std::string &owner,
uint32_t fsId,
uint32_t count,
const std::string &owner,
std::vector<curvefs::mds::space::BlockGroup> *groups) {
auto task = RPCTask {
AllocateBlockGroupResponse response;
Expand Down Expand Up @@ -692,7 +700,9 @@ SpaceErrCode MdsClientImpl::AllocateVolumeBlockGroup(
}

SpaceErrCode MdsClientImpl::AcquireVolumeBlockGroup(
uint32_t fsId, uint64_t blockGroupOffset, const std::string &owner,
uint32_t fsId,
uint64_t blockGroupOffset,
const std::string &owner,
curvefs::mds::space::BlockGroup *groups) {
auto task = RPCTask {
AcquireBlockGroupResponse response;
Expand All @@ -716,7 +726,8 @@ SpaceErrCode MdsClientImpl::AcquireVolumeBlockGroup(
}

SpaceErrCode MdsClientImpl::ReleaseVolumeBlockGroup(
uint32_t fsId, const std::string &owner,
uint32_t fsId,
const std::string &owner,
const std::vector<curvefs::mds::space::BlockGroup> &blockGroups) {
auto task = RPCTask {
ReleaseBlockGroupResponse response;
Expand Down
4 changes: 2 additions & 2 deletions curvefs/src/client/xattr_manager.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,13 @@ class XattrManager {
// dentry cache manager
std::shared_ptr<DentryCacheManager> dentryManager_;

Atomic<bool> isStop_;

InterruptibleSleeper sleeper_;

uint32_t listDentryLimit_;

uint32_t listDentryThreads_;

Atomic<bool> isStop_;
};

} // namespace client
Expand Down
5 changes: 5 additions & 0 deletions curvefs/src/mds/mds_service.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ void MdsServiceImpl::CreateFs(::google::protobuf::RpcController *controller,
const ::curvefs::mds::CreateFsRequest *request,
::curvefs::mds::CreateFsResponse *response,
::google::protobuf::Closure *done) {
(void)controller;
brpc::ClosureGuard doneGuard(done);
const std::string &fsName = request->fsname();
uint64_t blockSize = request->blocksize();
Expand Down Expand Up @@ -145,6 +146,7 @@ void MdsServiceImpl::MountFs(::google::protobuf::RpcController *controller,
const ::curvefs::mds::MountFsRequest *request,
::curvefs::mds::MountFsResponse *response,
::google::protobuf::Closure *done) {
(void)controller;
brpc::ClosureGuard doneGuard(done);
const std::string &fsName = request->fsname();
const Mountpoint &mount = request->mountpoint();
Expand All @@ -171,6 +173,7 @@ void MdsServiceImpl::UmountFs(::google::protobuf::RpcController *controller,
const ::curvefs::mds::UmountFsRequest *request,
::curvefs::mds::UmountFsResponse *response,
::google::protobuf::Closure *done) {
(void)controller;
brpc::ClosureGuard doneGuard(done);
const std::string &fsName = request->fsname();
const Mountpoint &mount = request->mountpoint();
Expand All @@ -193,6 +196,7 @@ void MdsServiceImpl::GetFsInfo(::google::protobuf::RpcController *controller,
const ::curvefs::mds::GetFsInfoRequest *request,
::curvefs::mds::GetFsInfoResponse *response,
::google::protobuf::Closure *done) {
(void)controller;
brpc::ClosureGuard doneGuard(done);

LOG(INFO) << "GetFsInfo request: " << request->ShortDebugString();
Expand Down Expand Up @@ -227,6 +231,7 @@ void MdsServiceImpl::DeleteFs(::google::protobuf::RpcController *controller,
const ::curvefs::mds::DeleteFsRequest *request,
::curvefs::mds::DeleteFsResponse *response,
::google::protobuf::Closure *done) {
(void)controller;
brpc::ClosureGuard doneGuard(done);
const std::string &fsName = request->fsname();
LOG(INFO) << "DeleteFs request, fsName = " << fsName;
Expand Down
1 change: 1 addition & 0 deletions curvefs/src/mds/schedule/leaderScheduler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ bool LeaderScheduler::TransferLeaderOut(MetaServerIdType source,
uint16_t replicaNum, PoolIdType poolId,
Operator *op,
CopySetInfo *selectedCopySet) {
(void)poolId;
// find all copyset with source metaserver as its leader as the candidate
std::vector<CopySetInfo> candidateInfos;
for (auto &cInfo : topo_->GetCopySetInfosInMetaServer(source)) {
Expand Down
Loading

0 comments on commit 8faca0e

Please sign in to comment.