Skip to content
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

Jump to bottom

Posix adapter shouldn't rely on O_TMPFILE support #389

Merged
merged 1 commit into from
Mar 25, 2022
Merged

Posix adapter shouldn't rely on O_TMPFILE support #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions adapter/posix/posix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@
#include "posix/mapper/mapper_factory.h"
#include "posix/metadata_manager.h"

#ifndef O_TMPFILE
#define O_TMPFILE 0
#endif

/**
* Function declarations
*/
Expand Down
16 changes: 16 additions & 0 deletions adapter/test/adapter_test_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,22 @@
#include <cstdio>
#include <string>

bool FilesystemSupportsTmpfile() {
bool result = false;

#if O_TMPFILE
// NOTE(chogan): Even if O_TMPFILE is defined, the underlying filesystem might
// not support it.
int tmp_fd = open("/tmp", O_WRONLY | O_TMPFILE, 0600);
if (tmp_fd > 0) {
result = true;
close(tmp_fd);
}
#endif

return result;
}

size_t GetRandomOffset(size_t i, unsigned int offset_seed, size_t stride,
size_t total_size) {
return abs((int)(((i * rand_r(&offset_seed)) % stride) % total_size));
Expand Down
36 changes: 19 additions & 17 deletions adapter/test/posix/posix_adapter_basic_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,23 +211,25 @@ TEST_CASE("Open", "[process=" + std::to_string(info.comm_size) +
REQUIRE(test::status_orig == 0);
}
SECTION("Temporary file") {
test::test_open("/tmp", O_WRONLY | O_TMPFILE, 0600);
REQUIRE(test::fh_orig != -1);
test::test_close();
REQUIRE(test::status_orig == 0);
test::test_open(info.new_file.c_str(), O_RDONLY | O_TMPFILE, 0600);
REQUIRE(test::fh_orig == -1);
test::test_open(info.new_file.c_str(), O_RDWR | O_TMPFILE, 0600);
REQUIRE(test::fh_orig == -1);
test::test_open(info.new_file.c_str(), O_APPEND | O_TMPFILE, 0600);
REQUIRE(test::fh_orig == -1);

test::test_open(info.existing_file.c_str(), O_WRONLY | O_TMPFILE, 0600);
REQUIRE(test::fh_orig == -1);
test::test_open(info.existing_file.c_str(), O_RDONLY | O_TMPFILE, 0600);
REQUIRE(test::fh_orig == -1);
test::test_open(info.existing_file.c_str(), O_RDWR | O_TMPFILE, 0600);
REQUIRE(test::fh_orig == -1);
if (info.supports_tmpfile) {
test::test_open("/tmp", O_WRONLY | O_TMPFILE, 0600);
REQUIRE(test::fh_orig != -1);
test::test_close();
REQUIRE(test::status_orig == 0);
test::test_open(info.new_file.c_str(), O_RDONLY | O_TMPFILE, 0600);
REQUIRE(test::fh_orig == -1);
test::test_open(info.new_file.c_str(), O_RDWR | O_TMPFILE, 0600);
REQUIRE(test::fh_orig == -1);
test::test_open(info.new_file.c_str(), O_APPEND | O_TMPFILE, 0600);
REQUIRE(test::fh_orig == -1);

test::test_open(info.existing_file.c_str(), O_WRONLY | O_TMPFILE, 0600);
REQUIRE(test::fh_orig == -1);
test::test_open(info.existing_file.c_str(), O_RDONLY | O_TMPFILE, 0600);
REQUIRE(test::fh_orig == -1);
test::test_open(info.existing_file.c_str(), O_RDWR | O_TMPFILE, 0600);
REQUIRE(test::fh_orig == -1);
}
}
posttest();
}
Expand Down
8 changes: 8 additions & 0 deletions adapter/test/posix/posix_adapter_mpi_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@

#include "catch_config.h"

#ifndef O_TMPFILE
#define O_TMPFILE 0
#endif

#include "adapter_test_utils.h"

#if HERMES_INTERCEPT == 1
Expand All @@ -35,6 +39,7 @@ struct Arguments {
};
struct Info {
bool debug = false;
bool supports_tmpfile;
int rank = 0;
int comm_size = 1;
std::vector<char> write_data;
Expand Down Expand Up @@ -78,10 +83,12 @@ std::vector<char> gen_random(const int len) {

return tmp_s;
}

int init(int* argc, char*** argv) {
MPI_Init(argc, argv);
info.write_data = gen_random(args.request_size);
info.read_data = std::vector<char>(args.request_size, 'r');
info.supports_tmpfile = FilesystemSupportsTmpfile();
MPI_Comm_rank(MPI_COMM_WORLD, &info.rank);
MPI_Comm_size(MPI_COMM_WORLD, &info.comm_size);
if (info.debug && info.rank == 0) {
Expand All @@ -92,6 +99,7 @@ int init(int* argc, char*** argv) {
MPI_Barrier(MPI_COMM_WORLD);
return 0;
}

int finalize() {
MPI_Finalize();
return 0;
Expand Down
12 changes: 8 additions & 4 deletions adapter/test/posix/posix_adapter_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
#include <iostream>

#include "catch_config.h"
#include "adapter_test_utils.h"
#if HERMES_INTERCEPT == 1
#include "posix/posix.h"
#endif

#ifndef O_TMPFILE
#define __O_TMPFILE 020000000
#define O_TMPFILE (__O_TMPFILE | O_DIRECTORY)
#define O_TMPFILE_MASK (__O_TMPFILE | O_DIRECTORY | O_CREAT)
#define O_TMPFILE 0
#endif

#include "adapter_test_utils.h"

namespace fs = std::experimental::filesystem;

namespace hermes::adapter::posix::test {
Expand All @@ -39,6 +39,7 @@ struct Arguments {
struct Info {
int rank = 0;
int comm_size = 1;
bool supports_tmpfile;
std::vector<char> write_data;
std::vector<char> read_data;
std::string new_file;
Expand Down Expand Up @@ -71,12 +72,15 @@ std::vector<char> gen_random(const int len) {
tmp_s[i] = alphanum[rand() % (sizeof(alphanum) - 1)];
return tmp_s;
}

int init(int* argc, char*** argv) {
MPI_Init(argc, argv);
info.write_data = gen_random(args.request_size);
info.read_data = std::vector<char>(args.request_size, 'r');
info.supports_tmpfile = FilesystemSupportsTmpfile();
return 0;
}

int finalize() {
MPI_Finalize();
return 0;
Expand Down