pitrou commented on code in PR #43766:
URL: https://github.com/apache/arrow/pull/43766#discussion_r1735929092
##########
cpp/src/arrow/filesystem/gcsfs_test.cc:
##########
@@ -89,70 +67,64 @@ class GcsTestbench : public ::testing::Environment {
public:
GcsTestbench() {
port_ = std::to_string(GetListenPort());
- std::vector<std::string> names{"python3", "python"};
- // If the build script or application developer provides a value in the
PYTHON
- // environment variable, then just use that.
- if (const auto* env = std::getenv("PYTHON")) {
- names = {env};
- }
auto error = std::string("Could not start GCS emulator
'storage-testbench'");
+ auto server_process = std::make_unique<util::Process>();
+ auto status = server_process->SetExecutable("storage-testbench");
+ if (!status.ok()) {
+ error += " (exe not found)";
+ error_ = std::move(error);
+ return;
+ }
- auto testbench_is_running = [](bp::child& process, bp::ipstream& output) {
- // Wait for message: "* Restarting with"
- std::string line;
+ server_process->SetArgs({"--port", port_});
+ server_process->IgnoreStderr();
+ status = server_process->Execute();
+ if (!status.ok()) {
+ error += " (failed to launch: ";
+ error += status.ToString();
+ error += ")";
+ error_ = std::move(error);
+ return;
+ }
+
+ auto testbench_is_running = [&server_process, this]() {
+ auto ready_timeout = std::chrono::seconds(10);
std::chrono::time_point<std::chrono::steady_clock> end =
- std::chrono::steady_clock::now() + std::chrono::seconds(10);
- while (process.valid() && process.running() &&
- std::chrono::steady_clock::now() < end) {
- if (output.peek() && std::getline(output, line)) {
- std::cerr << line << std::endl;
- if (line.find("* Restarting with") != std::string::npos) return true;
- } else {
- std::this_thread::sleep_for(std::chrono::milliseconds(20));
+ std::chrono::steady_clock::now() + ready_timeout;
+ while (server_process->IsRunning() && std::chrono::steady_clock::now() <
end) {
+ auto client = gcs::Client(
+ google::cloud::Options{}
+ .set<gcs::RestEndpointOption>("http://127.0.0.1:"; + port_)
+
.set<gc::UnifiedCredentialsOption>(gc::MakeInsecureCredentials())
+ .set<gcs::RetryPolicyOption>(
+ gcs::LimitedTimeRetryPolicy(ready_timeout).clone()));
+ auto metadata = client.GetBucketMetadata("nonexistent");
+ if (metadata.status().code() == google::cloud::StatusCode::kNotFound) {
+ return true;
}
}
return false;
};
- auto exe_path = bp::search_path("storage-testbench");
- if (!exe_path.empty()) {
- bp::ipstream output;
- server_process_ =
- bp::child(exe_path, "--port", port_, group_, bp::std_err > output);
- if (!testbench_is_running(server_process_, output)) {
- error += " (failed to start)";
- server_process_.terminate();
- server_process_.wait();
- }
- } else {
- error += " (exe not found)";
- }
- if (!server_process_.valid()) {
+ if (!testbench_is_running()) {
+ error += " (failed to listen)";
error_ = std::move(error);
+ return;
}
+
+ server_process_ = std::move(server_process);
}
- bool running() { return server_process_.running(); }
+ bool running() { return server_process_ && server_process_->IsRunning(); }
- ~GcsTestbench() override {
- // Brutal shutdown, kill the full process group because the GCS testbench
may launch
- // additional children.
- try {
- group_.terminate();
- } catch (bp::process_error&) {
- }
- if (server_process_.valid()) {
- server_process_.wait();
- }
- }
+ ~GcsTestbench() override { server_process_ = nullptr; }
Review Comment:
```suggestion
~GcsTestbench() = default;
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
