diff --git a/curvefs/conf/tools.conf b/curvefs/conf/tools.conf index b34552f568..e49a5996ed 100644 --- a/curvefs/conf/tools.conf +++ b/curvefs/conf/tools.conf @@ -2,8 +2,8 @@ mdsAddr=127.0.0.1:6700 # __CURVEADM_TEMPLATE__ ${cluster_mds_addr} __CURVEADM_TEMPLATE__ __ANSIBLE_TEMPLATE__ {{ groups.mds | join_peer(hostvars, "mds_listen_port") }} __ANSIBLE_TEMPLATE__ mdsDummyAddr=127.0.0.1:7700 # __CURVEADM_TEMPLATE__ ${cluster_mds_dummy_addr} __CURVEADM_TEMPLATE__ __ANSIBLE_TEMPLATE__ {{ groups.mds | join_peer(hostvars, "mds_listen_dummy_port") }} __ANSIBLE_TEMPLATE__ # rpc timeout -rpcTimeoutMs=10000 -rpcRetryTimes=5 +rpcTimeoutMs=30000 +rpcRetryTimes=3 # rpc stream idle timeout rpcStreamIdleTimeoutMs=10000 # topo file path diff --git a/curvefs/src/tools/list/curvefs_partition_list.cpp b/curvefs/src/tools/list/curvefs_partition_list.cpp index fdc1ed90a3..b74960b62c 100644 --- a/curvefs/src/tools/list/curvefs_partition_list.cpp +++ b/curvefs/src/tools/list/curvefs_partition_list.cpp @@ -71,7 +71,7 @@ int PartitionListTool::Init() { curvefs::mds::topology::ListPartitionRequest request; for (const auto& i : fsIds) { - uint32_t fsId; + uint32_t fsId = 0; curve::common::StringToUl(i, &fsId); request.set_fsid(fsId); AddRequest(request); diff --git a/curvefs/src/tools/query/curvefs_inode_query.cpp b/curvefs/src/tools/query/curvefs_inode_query.cpp index cfcad11717..1c820d4dfb 100644 --- a/curvefs/src/tools/query/curvefs_inode_query.cpp +++ b/curvefs/src/tools/query/curvefs_inode_query.cpp @@ -65,11 +65,11 @@ int InodeQueryTool::Init() { } for (size_t i = 0; i < fsIds.size(); ++i) { InodeBase tmp; - uint64_t tmpFsId; + uint64_t tmpFsId = 0; curve::common::StringToUll(fsIds[i], &tmpFsId); tmp.set_fsid(tmpFsId); - uint64_t tmpInodeId; + uint64_t tmpInodeId = 0; curve::common::StringToUll(inodeIds[i], &tmpInodeId); tmp.set_inodeid(tmpInodeId); diff --git a/mk-deb.sh b/mk-deb.sh index 7ac3a9b677..0d4500687a 100644 --- a/mk-deb.sh +++ b/mk-deb.sh @@ -129,12 +129,12 @@ function build_curvefs_python() { bazel_version=`bazel version | grep "Build label" | awk '{print $3}'` if [ -z ${bazel_version} ] then - echo "please install bazel 0.17.2 first" + echo "please install bazel 4.2.2 first" exit fi -if [ ${bazel_version} != "0.17.2" ] +if [ ${bazel_version} != "4.2.2" ] then - echo "bazel version must 0.17.2" + echo "bazel version must 4.2.2" echo "now version is ${bazel_version}" exit fi diff --git a/mk-tar.sh b/mk-tar.sh index 1b6cb8dade..3bd23c3e09 100644 --- a/mk-tar.sh +++ b/mk-tar.sh @@ -129,12 +129,12 @@ function build_curvefs_python() { bazel_version=`bazel version | grep "Build label" | awk '{print $3}'` if [ -z ${bazel_version} ] then - echo "please install bazel 0.17.2 first" + echo "please install bazel 4.2.2 first" exit fi -if [ ${bazel_version} != "0.17.2" ] +if [ ${bazel_version} != "4.2.2" ] then - echo "bazel version must 0.17.2" + echo "bazel version must 4.2.2" echo "now version is ${bazel_version}" exit fi