Skip to content

delete redundancy check for path at DeleteDirectory and DiskUsage #855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
baobaoyeye wants to merge 3 commits into
base: master
Choose a base branch
from
Open

delete redundancy check for path at DeleteDirectory and DiskUsage #855

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfdc347
delete redundancy check for path at DeleteDirectory and DiskUsage
baobaoyeye Feb 20, 2017
23aa1b1
delete redundancy check for path at DeleteDirectory and DiskUsage
baobaoyeye Feb 20, 2017
0c04a74
delete redundancy check for path at DeleteDirectory and DiskUsage
baobaoyeye Feb 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions src/nameserver/nameserver_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -860,13 +855,13 @@ void NameServerImpl::DeleteDirectory(::google::protobuf::RpcController* controll
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 (request->path().empty()) {
response->set_status(kBadParameter);
done->Run();
return;
}
std::string path = NameSpace::NormalizePath(request->path());
bool recursive = request->recursive();
std::vector<FileInfo>* removed = new std::vector<FileInfo>;
NameServerLog log;
StatusCode ret_status = namespace_->DeleteDirectory(path, recursive, removed, &log);
Expand Down