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

Persistify deleted state and load it on daemon startup. #553

Merged
merged 1 commit into from
Jan 7, 2019
Merged

Persistify deleted state and load it on daemon startup. #553

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
28 changes: 23 additions & 5 deletions src/daemon/daemon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
#include <QJsonObject>
#include <QJsonParseError>

#include <cassert>
#include <functional>
#include <stdexcept>
#include <unordered_set>
Expand Down Expand Up @@ -224,6 +225,7 @@ std::unordered_map<std::string, mp::VMSpecs> load_db(const mp::Path& data_path,
auto mac_addr = record["mac_addr"].toString();
auto ssh_username = record["ssh_username"].toString();
auto state = record["state"].toInt();
auto deleted = record["deleted"].toBool();

if (ssh_username.isEmpty())
ssh_username = "ubuntu";
Expand Down Expand Up @@ -257,7 +259,8 @@ std::unordered_map<std::string, mp::VMSpecs> load_db(const mp::Path& data_path,
mac_addr.toStdString(),
ssh_username.toStdString(),
static_cast<mp::VirtualMachine::State>(state),
mounts};
mounts,
deleted};
}
return reconstructed_records;
}
Expand Down Expand Up @@ -549,7 +552,8 @@ mp::Daemon::Daemon(std::unique_ptr<const DaemonConfig> the_config)

try
{
vm_instances[name] = config->factory->create_virtual_machine(vm_desc, *this);
auto& instance_record = spec.deleted ? deleted_instances : vm_instances;
instance_record[name] = config->factory->create_virtual_machine(vm_desc, *this);
}
catch (const std::exception& e)
{
Expand All @@ -560,7 +564,9 @@ mp::Daemon::Daemon(std::unique_ptr<const DaemonConfig> the_config)

if (spec.state == VirtualMachine::State::running && vm_instances[name]->state != VirtualMachine::State::running)
{
assert(!spec.deleted);
mpl::log(mpl::Level::info, category, fmt::format("{} needs starting. Starting now...", name));

QTimer::singleShot(0, [this, &name] {
vm_instances[name]->start();
on_restart(name);
Expand Down Expand Up @@ -736,7 +742,8 @@ try // clang-format on
vm_desc.mac_addr,
config->ssh_username,
VirtualMachine::State::off,
{}};
{},
false};
persist_instances();

reply.set_create_message("Starting " + name);
Expand Down Expand Up @@ -1302,6 +1309,8 @@ try // clang-format on
auto it = deleted_instances.find(name);
if(it != std::end(deleted_instances))
{
assert(vm_instance_specs[name].deleted);
vm_instance_specs[name].deleted = false;
vm_instances[name] = std::move(it->second);
deleted_instances.erase(it);
}
Expand All @@ -1311,6 +1320,8 @@ try // clang-format on
fmt::format("instance \"{}\" does not need to be recovered", name));
}
}

persist_instances();
}

return status;
Expand Down Expand Up @@ -1625,6 +1636,8 @@ try // clang-format on

for (const auto& name : operational_instances_to_delete)
{
assert(!vm_instance_specs[name].deleted);

auto& instance = vm_instances[name];

if (instance->current_state() == VirtualMachine::State::delayed_shutdown)
Expand All @@ -1636,7 +1649,10 @@ try // clang-format on
if (purge)
release_resources(name);
else
{
deleted_instances[name] = std::move(instance);
vm_instance_specs[name].deleted = true;
}

vm_instances.erase(name);
}
Expand All @@ -1645,12 +1661,13 @@ try // clang-format on
{
for (const auto& name : trashed_instances_to_delete)
{
assert(vm_instance_specs[name].deleted);
release_resources(name);
deleted_instances.erase(name);
}

persist_instances();
}

persist_instances();
}

return status;
Expand Down Expand Up @@ -1813,6 +1830,7 @@ void mp::Daemon::persist_instances()
json.insert("mac_addr", QString::fromStdString(specs.mac_addr));
json.insert("ssh_username", QString::fromStdString(specs.ssh_username));
json.insert("state", static_cast<int>(specs.state));
json.insert("deleted", specs.deleted);

QJsonArray mounts;
for (const auto& mount : specs.mounts)
Expand Down
1 change: 1 addition & 0 deletions src/daemon/daemon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ struct VMSpecs
std::string ssh_username;
VirtualMachine::State state;
std::unordered_map<std::string, VMMount> mounts;
bool deleted;
};

struct MetricsOptInData
Expand Down