jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Just waiting 3 seconds when stop container.

Browse source 
If container manager dies before session manager dying,
the session manager cannot exit if it waits for all.

This patch fix the above issue.

Signed-off-by: Han Pengfei <hanpfei@gmail.com>
This commit is contained in:
Han Pengfei 2018-02-01 15:00:23 +08:00
commit 083b54cc2d
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/anbox/container/management_api_stub.cpp
View file

@ -24,6 +24,9 @@
namespace anbox { namespace anbox {
namespace container { namespace container {
const std::chrono::milliseconds ManagementApiStub::stop_waiting_millis{3000};
ManagementApiStub::ManagementApiStub( ManagementApiStub::ManagementApiStub(
const std::shared_ptr<rpc::Channel> &channel) const std::shared_ptr<rpc::Channel> &channel)
: channel_(channel) {} : channel_(channel) {}
@ -75,7 +78,7 @@ void ManagementApiStub::stop_container() {
channel_->call_method("stop_container", &message, c->response.get(), channel_->call_method("stop_container", &message, c->response.get(),
google::protobuf::NewCallback(this, &ManagementApiStub::container_stopped, c.get())); google::protobuf::NewCallback(this, &ManagementApiStub::container_stopped, c.get()));
c->wh.wait_for_all(); c->wh.wait_for_pending(stop_waiting_millis);
if (c->response->has_error()) throw std::runtime_error(c->response->error()); if (c->response->has_error()) throw std::runtime_error(c->response->error());
} }

1
src/anbox/container/management_api_stub.h
View file

@ -56,6 +56,7 @@ class ManagementApiStub : public DoNotCopyOrMove {
mutable std::mutex mutex_; mutable std::mutex mutex_;
std::shared_ptr<rpc::Channel> channel_; std::shared_ptr<rpc::Channel> channel_;
static const std::chrono::milliseconds stop_waiting_millis;
}; };
} // namespace container } // namespace container
} // namespace anbox } // namespace anbox