Skip to content

HDFS-16178. Make recursive rmdir in libhdfs++ cross platform #3311

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

Merged
goiri merged 2 commits into from
Aug 20, 2021
Merged

HDFS-16178. Make recursive rmdir in libhdfs++ cross platform #3311

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93d8ed5
HDFS-16178. Make recursive rmdir in libhdfs++ cross platform
GauthamBanasandra Aug 18, 2021
0ae3c13
Check whether directory was deleted
GauthamBanasandra Aug 19, 2021
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
32 changes: 13 additions & 19 deletions ...-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/utils/temp-dir.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,18 @@
* limitations under the License.
*/

#include <filesystem>
#include <iostream>
#include <string>
#include <system_error>
#include <vector>

#include <ftw.h>
#include <gtest/gtest.h>
#include <sys/stat.h>

#include "utils/temp-dir.h"
#include "x-platform/syscall.h"

namespace TestUtils {
/*
* Callback to remove a directory in the nftw visitor.
*/
int nftw_remove(const char *fpath, const struct stat *sb, int typeflag,
struct FTW *ftwbuf);

TempDir::TempDir() {
std::vector path_pattern(path_.begin(), path_.end());
is_path_init_ = XPlatform::Syscall::CreateTempDir(path_pattern);
Expand All @@ -57,19 +52,18 @@ TempDir &TempDir::operator=(TempDir &&other) noexcept {
}

TempDir::~TempDir() {
if (is_path_init_) {
nftw(path_.c_str(), nftw_remove, 64, FTW_DEPTH | FTW_PHYS);
if (!is_path_init_) {
return;
}
}

int nftw_remove(const char *fpath, const struct stat *sb, int typeflag,
FTW *ftwbuf) {
(void)sb;
(void)typeflag;
(void)ftwbuf;
const std::filesystem::path tmp_dir_path(path_);
std::error_code tmp_dir_rm_err;

int rv = remove(fpath);
EXPECT_EQ(0, rv);
return rv;
const auto tmp_dir_rm_result = remove_all(tmp_dir_path, tmp_dir_rm_err);
EXPECT_TRUE(tmp_dir_rm_result);
if (!tmp_dir_rm_result) {
std::cerr << "Error in deleting directory " << path_ << ": "
<< tmp_dir_rm_err.message() << std::endl;
}
}
} // namespace TestUtils