From cfdc3478a4c57dd0f873dd45a58dcbe02d58b492 Mon Sep 17 00:00:00 2001 From: baobaoyeye Date: Mon, 20 Feb 2017 19:34:48 +0800 Subject: [PATCH 1/3] delete redundancy check for path at DeleteDirectory and DiskUsage --- src/nameserver/nameserver_impl.cc | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/nameserver/nameserver_impl.cc b/src/nameserver/nameserver_impl.cc index d7b9d087..0b33559b 100644 --- a/src/nameserver/nameserver_impl.cc +++ b/src/nameserver/nameserver_impl.cc @@ -837,11 +837,6 @@ void NameServerImpl::DiskUsage(::google::protobuf::RpcController* controller, } response->set_sequence_id(request->sequence_id()); std::string path = NameSpace::NormalizePath(request->path()); - if (path.empty() || path[0] != '/') { - response->set_status(kBadParameter); - done->Run(); - return; - } uint64_t du_size = 0; StatusCode ret_status = namespace_->DiskUsage(path, &du_size); response->set_status(ret_status); @@ -859,14 +854,14 @@ void NameServerImpl::DeleteDirectory(::google::protobuf::RpcController* controll done->Run(); return; } - response->set_sequence_id(request->sequence_id()); - std::string path = NameSpace::NormalizePath(request->path()); - bool recursive = request->recursive(); - if (path.empty() || path[0] != '/') { + if (path.empty()) { response->set_status(kBadParameter); done->Run(); return; } + response->set_sequence_id(request->sequence_id()); + std::string path = NameSpace::NormalizePath(request->path()); + bool recursive = request->recursive(); std::vector* removed = new std::vector; NameServerLog log; StatusCode ret_status = namespace_->DeleteDirectory(path, recursive, removed, &log); From 23aa1b1922a199c35c849b10f584082e86aef7e0 Mon Sep 17 00:00:00 2001 From: baobaoyeye Date: Mon, 20 Feb 2017 19:47:32 +0800 Subject: [PATCH 2/3] delete redundancy check for path at DeleteDirectory and DiskUsage --- src/nameserver/nameserver_impl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nameserver/nameserver_impl.cc b/src/nameserver/nameserver_impl.cc index 0b33559b..52950315 100644 --- a/src/nameserver/nameserver_impl.cc +++ b/src/nameserver/nameserver_impl.cc @@ -854,7 +854,7 @@ void NameServerImpl::DeleteDirectory(::google::protobuf::RpcController* controll done->Run(); return; } - if (path.empty()) { + if (request->path().empty()) { response->set_status(kBadParameter); done->Run(); return; From 0c04a742a5073f80738678312009977129868d4b Mon Sep 17 00:00:00 2001 From: baobaoyeye Date: Mon, 20 Feb 2017 19:49:52 +0800 Subject: [PATCH 3/3] delete redundancy check for path at DeleteDirectory and DiskUsage --- src/nameserver/nameserver_impl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nameserver/nameserver_impl.cc b/src/nameserver/nameserver_impl.cc index 52950315..3057b7e3 100644 --- a/src/nameserver/nameserver_impl.cc +++ b/src/nameserver/nameserver_impl.cc @@ -854,12 +854,12 @@ void NameServerImpl::DeleteDirectory(::google::protobuf::RpcController* controll done->Run(); return; } + response->set_sequence_id(request->sequence_id()); if (request->path().empty()) { response->set_status(kBadParameter); done->Run(); return; } - response->set_sequence_id(request->sequence_id()); std::string path = NameSpace::NormalizePath(request->path()); bool recursive = request->recursive(); std::vector* removed = new std::vector;