Merge pull request #3161 from canonical/populate-snapshot-details

[snapshots] populate snapshot details
canonical · Aug 25, 2023 · f2ad7a6 · f2ad7a6
2 parents 2a71f74 + 729afb2
commit f2ad7a6
Show file tree

Hide file tree

Showing 11 changed files with 204 additions and 126 deletions.
diff --git a/include/multipass/snapshot.h b/include/multipass/snapshot.h
@@ -40,7 +40,7 @@ class Snapshot : private DisabledCopyMove
 
     virtual std::string get_name() const = 0;
     virtual std::string get_comment() const = 0;
-    virtual std::string get_parent_name() const = 0;
+    virtual std::string get_parents_name() const = 0;
     virtual QDateTime get_creation_timestamp() const = 0;
     virtual std::shared_ptr<const Snapshot> get_parent() const = 0;
     virtual std::shared_ptr<Snapshot> get_parent() = 0;

diff --git a/include/multipass/virtual_machine.h b/include/multipass/virtual_machine.h
@@ -96,6 +96,7 @@ class VirtualMachine : private DisabledCopyMove
     virtual void delete_snapshot(const QDir& snapshot_dir, const std::string& name) = 0;
     virtual void restore_snapshot(const QDir& snapshot_dir, const std::string& name, VMSpecs& specs) = 0;
     virtual void load_snapshots(const QDir& snapshot_dir) = 0;
+    virtual std::vector<std::string> get_childrens_names(const Snapshot* parent) const = 0;
 
     VirtualMachine::State state;
     const std::string vm_name;

diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
diff --git a/src/daemon/daemon.h b/src/daemon/daemon.h
@@ -191,6 +191,9 @@ public slots:
     template <typename Reply, typename Request>
     void reply_msg(grpc::ServerReaderWriterInterface<Reply, Request>* server, std::string&& msg, bool sticky = false);
 
+    void populate_instance_info(VirtualMachine& vm, DetailedInfoItem* info, bool runtime_info, bool deleted,
+                                bool& have_mounts);
+
     std::unique_ptr<const DaemonConfig> config;
     std::unordered_map<std::string, VMSpecs> vm_instance_specs;
     InstanceTable operative_instances;

diff --git a/src/platform/backends/shared/base_snapshot.cpp b/src/platform/backends/shared/base_snapshot.cpp
@@ -152,7 +152,7 @@ QJsonObject multipass::BaseSnapshot::serialize() const
     snapshot.insert("disk_space", QString::number(disk_space.in_bytes()));
     snapshot.insert("state", static_cast<int>(state));
     snapshot.insert("metadata", metadata);
-    snapshot.insert("parent", QString::fromStdString(get_parent_name()));
+    snapshot.insert("parent", QString::fromStdString(get_parents_name()));
 
     // Extract mount serialization
     QJsonArray json_mounts;

diff --git a/src/platform/backends/shared/base_snapshot.h b/src/platform/backends/shared/base_snapshot.h
@@ -41,7 +41,7 @@ class BaseSnapshot : public Snapshot
     std::string get_name() const override;
     std::string get_comment() const override;
     QDateTime get_creation_timestamp() const override;
-    std::string get_parent_name() const override;
+    std::string get_parents_name() const override;
     std::shared_ptr<const Snapshot> get_parent() const override;
     std::shared_ptr<Snapshot> get_parent() override;
 
@@ -115,7 +115,7 @@ inline QDateTime multipass::BaseSnapshot::get_creation_timestamp() const
     return creation_timestamp;
 }
 
-inline std::string multipass::BaseSnapshot::get_parent_name() const
+inline std::string multipass::BaseSnapshot::get_parents_name() const
 {
     std::unique_lock lock{mutex};
     auto par = parent;

diff --git a/src/platform/backends/shared/base_virtual_machine.cpp b/src/platform/backends/shared/base_virtual_machine.cpp
@@ -356,6 +356,17 @@ void BaseVirtualMachine::load_snapshots(const QDir& snapshot_dir)
     load_generic_snapshot_info(snapshot_dir);
 }
 
+std::vector<std::string> BaseVirtualMachine::get_childrens_names(const Snapshot* parent) const
+{
+    std::vector<std::string> children;
+
+    for (const auto& snapshot : view_snapshots())
+        if (snapshot->get_parent().get() == parent)
+            children.push_back(snapshot->get_name());
+
+    return children;
+}
+
 void BaseVirtualMachine::load_generic_snapshot_info(const QDir& snapshot_dir)
 {
     try
@@ -376,7 +387,7 @@ template <typename LockT>
 void BaseVirtualMachine::log_latest_snapshot(LockT lock) const
 {
     auto num_snapshots = static_cast<int>(snapshots.size());
-    auto parent_name = head_snapshot->get_parent_name();
+    auto parent_name = head_snapshot->get_parents_name();
 
     assert(num_snapshots <= snapshot_count && "can't have more snapshots than were ever taken");
 
@@ -424,7 +435,7 @@ void BaseVirtualMachine::load_snapshot(const QJsonObject& json)
 
 auto BaseVirtualMachine::make_head_file_rollback(const Path& head_path, QFile& head_file) const
 {
-    return sg::make_scope_guard([this, &head_path, &head_file, old_head = head_snapshot->get_parent_name(),
+    return sg::make_scope_guard([this, &head_path, &head_file, old_head = head_snapshot->get_parents_name(),
                                  existed = head_file.exists()]() noexcept {
         head_file_rollback_helper(head_path, head_file, old_head, existed);
     });

diff --git a/src/platform/backends/shared/base_virtual_machine.h b/src/platform/backends/shared/base_virtual_machine.h
@@ -69,6 +69,7 @@ class BaseVirtualMachine : public VirtualMachine
     void delete_snapshot(const QDir& snapshot_dir, const std::string& name) override;
     void restore_snapshot(const QDir& snapshot_dir, const std::string& name, VMSpecs& specs) override;
     void load_snapshots(const QDir& snapshot_dir) override;
+    std::vector<std::string> get_childrens_names(const Snapshot* parent) const override;
 
 protected:
     virtual std::shared_ptr<Snapshot> make_specific_snapshot(const QJsonObject& json) = 0;

diff --git a/tests/mock_virtual_machine.h b/tests/mock_virtual_machine.h
@@ -75,6 +75,7 @@ struct MockVirtualMachineT : public T
     MOCK_METHOD(void, delete_snapshot, (const QDir& snapshot_dir, const std::string& name), (override));
     MOCK_METHOD(void, restore_snapshot, (const QDir& snapshot_dir, const std::string&, VMSpecs&), (override));
     MOCK_METHOD(void, load_snapshots, (const QDir&), (override));
+    MOCK_METHOD(std::vector<std::string>, get_childrens_names, (const Snapshot*), (const, override));
 };
 
 using MockVirtualMachine = MockVirtualMachineT<>;

diff --git a/tests/stub_snapshot.h b/tests/stub_snapshot.h
@@ -42,7 +42,7 @@ struct StubSnapshot : public Snapshot
         return QDateTime{};
     }
 
-    std::string get_parent_name() const override
+    std::string get_parents_name() const override
     {
         return {};
     }

diff --git a/tests/stub_virtual_machine.h b/tests/stub_virtual_machine.h
@@ -156,6 +156,11 @@ struct StubVirtualMachine final : public multipass::VirtualMachine
     {
     }
 
+    std::vector<std::string> get_childrens_names(const Snapshot*) const override
+    {
+        return {};
+    }
+
     StubSnapshot snapshot;
 };
 } // namespace test