Skip to content

Commit 7d17e73

Browse files
rock-gitchuandew
authored andcommitted
[feat][mds] Adjust Open rpc log print.
1 parent a9ae37d commit 7d17e73

File tree

5 files changed

+39
-7
lines changed

5 files changed

+39
-7
lines changed

scripts/dev/deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ eval set -- "${FLAGS_ARGV}"
1616
echo "role: ${FLAGS_role}"
1717
echo "parameters: ${FLAGS_parameters}"
1818

19-
BASE_DIR=$(dirname $(cd $(dirname $0); pwd))
19+
BASE_DIR=$(dirname $(dirname $(cd $(dirname $0); pwd)))
2020
DIST_DIR=$BASE_DIR/dist
2121

2222
if [ ! -d "$DIST_DIR" ]; then

scripts/dev/start.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ eval set -- "${FLAGS_ARGV}"
1818

1919
echo "start role(${FLAGS_role}) server num(${FLAGS_server_num})"
2020

21-
BASE_DIR=$(dirname $(cd $(dirname $0); pwd))
21+
BASE_DIR=$(dirname $(dirname $(cd $(dirname $0); pwd)))
2222
DIST_DIR=$BASE_DIR/dist
2323

24+
25+
2426
function set_ulimit() {
2527
NUM_FILE=1048576
2628
NUM_PROC=4194304

scripts/dev/start_fuse.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ fi
4040

4141
echo "start fuse fsname(${FLAGS_fsname}) fstype(${FLAGS_fstype}) mountpoint(${FLAGS_mountpoint})"
4242

43-
BASE_DIR=$(dirname $(cd $(dirname $0); pwd))
43+
BASE_DIR=$(dirname $(dirname $(cd $(dirname $0); pwd)))
4444
FUSE_BASE_DIR=$BASE_DIR/dist/fuse
4545
FUSE_BIN_PATH=$FUSE_BASE_DIR/bin/dingo-fuse
4646
FUSE_CONF_DIR=$FUSE_BASE_DIR/conf

scripts/dev/stop.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ eval set -- "${FLAGS_ARGV}"
1515

1616
echo "stop role(${FLAGS_role}) server num(${FLAGS_server_num})"
1717

18-
BASE_DIR=$(dirname $(cd $(dirname $0); pwd))
18+
BASE_DIR=$(dirname $(dirname $(cd $(dirname $0); pwd)))
1919
DIST_DIR=$BASE_DIR/dist
2020

2121

src/client/vfs/meta/v2/rpc.h

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,26 @@ inline std::string DescribeReadSliceResponse(
209209
return oss.str();
210210
}
211211

212+
// print OpenResponse
213+
inline std::string DescribeOpenResponse(pb::mds::OpenResponse& response) {
214+
std::ostringstream oss;
215+
oss << response.info().ShortDebugString()
216+
<< " session_id:" << response.session_id() << " inode("
217+
<< response.inode().ShortDebugString() << ") chunks[";
218+
for (const auto& chunk : response.chunks()) {
219+
std::vector<uint64_t> slice_ids;
220+
slice_ids.reserve(chunk.slices().size());
221+
for (const auto& slice : chunk.slices()) {
222+
slice_ids.push_back(slice.id());
223+
}
224+
oss << fmt::format("({},{} slice_ids{}),", chunk.index(), chunk.version(),
225+
slice_ids);
226+
}
227+
228+
oss << "]";
229+
return oss.str();
230+
}
231+
212232
template <typename Request, typename Response>
213233
Status RPC::SendRequest(const EndPoint& endpoint,
214234
const std::string& service_name,
@@ -269,21 +289,31 @@ Status RPC::SendRequest(const EndPoint& endpoint,
269289
}
270290

271291
if (response.error().errcode() == pb::error::OK) {
272-
if constexpr (!std::is_same_v<Response, pb::mds::ReadSliceResponse>) {
292+
if constexpr (std::is_same_v<Response, pb::mds::ReadSliceResponse>) {
273293
LOG(INFO) << fmt::format(
274294
"[meta.rpc][{}][{}][{}us] success, retry({}) request({}) "
275295
"response({}) doing({}).",
276296
EndPointToStr(endpoint), api_name, elapsed_us, retry,
277-
request.ShortDebugString(), response.ShortDebugString(),
297+
request.ShortDebugString(), DescribeReadSliceResponse(response),
278298
DoingReqCount());
299+
300+
} else if constexpr (std::is_same_v<Response, pb::mds::OpenResponse>) {
301+
LOG(INFO) << fmt::format(
302+
"[meta.rpc][{}][{}][{}us] success, retry({}) request({}) "
303+
"response({}) doing({}).",
304+
EndPointToStr(endpoint), api_name, elapsed_us, retry,
305+
request.ShortDebugString(), DescribeOpenResponse(response),
306+
DoingReqCount());
307+
279308
} else {
280309
LOG(INFO) << fmt::format(
281310
"[meta.rpc][{}][{}][{}us] success, retry({}) request({}) "
282311
"response({}) doing({}).",
283312
EndPointToStr(endpoint), api_name, elapsed_us, retry,
284-
request.ShortDebugString(), DescribeReadSliceResponse(response),
313+
request.ShortDebugString(), response.ShortDebugString(),
285314
DoingReqCount());
286315
}
316+
287317
return Status::OK();
288318
}
289319

0 commit comments

Comments
 (0)