Skip to content

Fixed Task_container to support Evacuate. Fixed some indention. #63

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
merged 1 commit into from
Apr 12, 2018
Merged

Fixed Task_container to support Evacuate. Fixed some indention. #63

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
2 changes: 1 addition & 1 deletion include/fast-lib/log.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace fast {
class Dev_null
{
};
extern Dev_null dev_null;
extern Dev_null dev_null;
template<typename T> Dev_null & operator<<(Dev_null &dest, T)
{
return dest;
Expand Down
2 changes: 1 addition & 1 deletion include/fast-lib/message/agent/mmbwmon/reply.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ struct reply : public fast::Serializable
void load(const YAML::Node &node) override;

std::vector<size_t> cores;
double result;
double result;
};

}
Expand Down
2 changes: 1 addition & 1 deletion include/fast-lib/message/agent/mmbwmon/restart.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ struct restart : public fast::Serializable
YAML::Node emit() const override;
void load(const YAML::Node &node) override;

std::string cgroup;
std::string cgroup;
};

}
Expand Down
2 changes: 1 addition & 1 deletion include/fast-lib/message/agent/mmbwmon/stop.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ struct stop : public fast::Serializable
YAML::Node emit() const override;
void load(const YAML::Node &node) override;

std::string cgroup;
std::string cgroup;
};

}
Expand Down
6 changes: 3 additions & 3 deletions include/fast-lib/message/migfra/task.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,9 @@ struct Evacuate :
YAML::Node emit() const override;
void load(const YAML::Node &node) override;

std::vector<std::string> destinations;
Optional<std::string> mode;
Optional<bool> overbooking;
std::vector<std::string> destinations;
Optional<std::string> mode;
Optional<bool> overbooking;
Optional<unsigned int> retry_counter;
Optional<std::string> migration_type;
Optional<bool> rdma_migration;
Expand Down
2 changes: 1 addition & 1 deletion src/message/agent/mmbwmon/reply.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ YAML::Node reply::emit() const
void reply::load(const YAML::Node &node)
{
fast::load(cores, node["cores"]);
fast::load(result, node["result"]);
fast::load(result, node["result"]);
}

}
Expand Down
6 changes: 3 additions & 3 deletions src/message/migfra/pci_id.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ namespace migfra {
// Converts integer type numbers to string in hex format.
static std::string to_hex_string(unsigned int integer, int digits, bool show_base = true)
{
std::stringstream ss;
ss << (show_base ? "0x" : "") << std::hex << std::setfill('0') << std::setw(digits) << +integer;
return ss.str();
std::stringstream ss;
ss << (show_base ? "0x" : "") << std::hex << std::setfill('0') << std::setw(digits) << +integer;
return ss.str();
}


Expand Down
27 changes: 20 additions & 7 deletions src/message/migfra/task.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ Task_container::Task_container(std::vector<std::shared_ptr<Task>> tasks, bool co

std::string Task_container::type(bool enable_result_format) const
{
std::array<std::string, 7> types;
std::array<std::string, 8> types;
if (enable_result_format)
types = {{"vm started", "vm stopped", "vm migrated", "vm repinned", "vm suspended", "vm resumed", "quit"}};
types = {{"vm started", "vm stopped", "vm migrated", "node evacuated" "vm repinned", "vm suspended", "vm resumed", "quit"}};
else
types = {{"start vm", "stop vm", "migrate vm", "repin vm", "suspend vm", "resume vm", "quit"}};
types = {{"start vm", "stop vm", "migrate vm", "evacuate node", "repin vm", "suspend vm", "resume vm", "quit"}};
if (tasks.empty())
throw std::runtime_error("No subtasks available to get type.");
else if (std::dynamic_pointer_cast<Start>(tasks.front()))
Expand All @@ -83,14 +83,16 @@ std::string Task_container::type(bool enable_result_format) const
return types[1];
else if (std::dynamic_pointer_cast<Migrate>(tasks.front()))
return types[2];
else if (std::dynamic_pointer_cast<Repin>(tasks.front()))
else if (std::dynamic_pointer_cast<Evacuate>(tasks.front()))
return types[3];
else if (std::dynamic_pointer_cast<Suspend>(tasks.front()))
else if (std::dynamic_pointer_cast<Repin>(tasks.front()))
return types[4];
else if (std::dynamic_pointer_cast<Resume>(tasks.front()))
else if (std::dynamic_pointer_cast<Suspend>(tasks.front()))
return types[5];
else if (std::dynamic_pointer_cast<Quit>(tasks.front()))
else if (std::dynamic_pointer_cast<Resume>(tasks.front()))
return types[6];
else if (std::dynamic_pointer_cast<Quit>(tasks.front()))
return types[7];
else
throw std::runtime_error("Unknown type of Task.");

Expand All @@ -104,6 +106,8 @@ YAML::Node Task_container::emit() const
node["task"] = type_str;
if (type_str == "migrate vm") {
merge_node(node, tasks.front()->emit());
} else if (type_str == "evacuate node") {
merge_node(node, tasks.front()->emit());
} else if (type_str == "repin vm") {
merge_node(node, tasks.front()->emit());
} else if (type_str == "start vm") {
Expand Down Expand Up @@ -143,6 +147,13 @@ static std::vector<std::shared_ptr<Task>> load_migrate_task(const YAML::Node &no
return std::vector<std::shared_ptr<Task>>(1, migrate_task);
}

static std::vector<std::shared_ptr<Task>> load_evacuate_task(const YAML::Node &node)
{
std::shared_ptr<Evacuate> evacuate_task;
fast::load(evacuate_task, node);
return std::vector<std::shared_ptr<Task>>(1, evacuate_task);
}

static std::vector<std::shared_ptr<Task>> load_repin_task(const YAML::Node &node)
{
std::shared_ptr<Repin> repin_task;
Expand Down Expand Up @@ -185,6 +196,8 @@ void Task_container::load(const YAML::Node &node)
tasks = load_stop_task(node);
} else if (type == "migrate vm") {
tasks = load_migrate_task(node);
} else if (type == "evacuate node") {
tasks = load_evacuate_task(node);
} else if (type == "repin vm") {
tasks = load_repin_task(node);
} else if (type == "suspend vm") {
Expand Down