[Add] add force-delete model in daemon.

In rpk uninstall, The target model will be deteted, even if the model is activated.
Add force-delete model in daemon.

Signed-off-by: Suyeon Kim <suyeon5.kim@samsung.com>

diff --git a/daemon/dbus-interface.h b/daemon/dbus-interface.h
index b381c905724582cead23b4c95ecdeea5818352d4..e0015f2c60bfe9e304c963689716858b935ebd47 100644 (file)
--- a/daemon/dbus-interface.h
+++ b/daemon/dbus-interface.h
@@ -47,6 +47,7 @@
 #define DBUS_MODEL_I_HANDLER_GET_ACTIVATED      "handle-get-activated"
 #define DBUS_MODEL_I_HANDLER_GET_ALL            "handle-get-all"
 #define DBUS_MODEL_I_HANDLER_DELETE             "handle-delete"
+#define DBUS_MODEL_I_HANDLER_DELETE_FORCE       "handle-delete-force"
 
 /* Resource Interface */
 #define DBUS_RESOURCE_INTERFACE         "org.tizen.machinelearning.service.resource"

diff --git a/daemon/include/mlops-agent-interface.h b/daemon/include/mlops-agent-interface.h
index adee390919d2da069ade83689ff7f07f6386a2f6..a9b1d6ec261c1ac755c2e0e4ac4e954f5bc5fb95 100644 (file)
--- a/daemon/include/mlops-agent-interface.h
+++ b/daemon/include/mlops-agent-interface.h
@@ -145,6 +145,17 @@ int ml_agent_model_get_all (const char *name, char **model_info);
  */
 int ml_agent_model_delete (const char *name, const uint32_t version);
 
+/**
+ * @brief An interface exported for removing the model of @a name and @a version.
+ * @details If version is 0, this function removes all registered model of @a name.
+ * @param[in] name A name indicating the model that would be removed.
+ * @param[in] version A version for identifying a specific model.
+ * @param[in] force A force to forcibly delete a specific model.
+ * @return 0 on success, a negative error value if failed.
+ */
+int ml_agent_model_delete_force (
+    const char *name, const uint32_t version, const gboolean force);
+
 /**
  * @brief An interface exported for adding the resource.
  * @param[in] name A name indicating the resource.

diff --git a/daemon/mlops-agent-interface.c b/daemon/mlops-agent-interface.c
index ded8abdcf01b1f8efb584b8ebfbcc4c0b1942568..864a50e4380361fb99b5cfdf9eef1f5a12961f1a 100644 (file)
--- a/daemon/mlops-agent-interface.c
+++ b/daemon/mlops-agent-interface.c
@@ -489,6 +489,33 @@ ml_agent_model_delete (const char *name, const uint32_t version)
   return 0;
 }
 
+/**
+ * @brief An interface exported for forcibly removing the model of @a name and @a version if @a force is true.
+ */
+int
+ml_agent_model_delete_force (const char *name, const uint32_t version, const gboolean force)
+{
+  MachinelearningServiceModel *mlsm;
+  gboolean result;
+  gint ret;
+
+  if (!STR_IS_VALID (name)) {
+    g_return_val_if_reached (-EINVAL);
+  }
+
+  mlsm = _get_proxy_new_for_bus_sync (ML_AGENT_SERVICE_MODEL);
+  if (!mlsm) {
+    g_return_val_if_reached (-EIO);
+  }
+
+  result = machinelearning_service_model_call_delete_force_sync (
+      mlsm, name, version, force, &ret, NULL, NULL);
+  g_object_unref (mlsm);
+
+  g_return_val_if_fail (ret == 0 && result, ret);
+  return 0;
+}
+
 /**
  * @brief An interface exported for adding the resource.
  */

diff --git a/daemon/model-dbus-impl.cc b/daemon/model-dbus-impl.cc
index c474db7342ede39f2cd92a6f4470af1b58099379..3545260581bd383a10ffb96e88caddb2a326c008 100644 (file)
--- a/daemon/model-dbus-impl.cc
+++ b/daemon/model-dbus-impl.cc
@@ -194,6 +194,28 @@ gdbus_cb_model_delete (MachinelearningServiceModel *obj,
   return TRUE;
 }
 
+/**
+ * @brief The callback function of delete method
+ *
+ * @param obj Proxy instance.
+ * @param invoc Method invocation handle.
+ * @param name The name of target model.
+ * @param version The version of target model.
+ * @param force If the force is set to @c TRUE, the target model will be forced to delete.
+ * @return @c TRUE if the request is handled. FALSE if the service is not available.
+ */
+static gboolean
+gdbus_cb_model_delete_force (MachinelearningServiceModel *obj,
+    GDBusMethodInvocation *invoc, const gchar *name, const guint version, const gboolean force)
+{
+  gint ret = 0;
+
+  ret = svcdb_model_delete_force (name, version, force);
+  machinelearning_service_model_complete_delete_force (obj, invoc, ret);
+
+  return TRUE;
+}
+
 /**
  * @brief Event handler list of Model interface
  */
@@ -240,6 +262,12 @@ static struct gdbus_signal_info handler_infos[] = {
       .cb_data = NULL,
       .handler_id = 0,
   },
+  {
+      .signal_name = DBUS_MODEL_I_HANDLER_DELETE_FORCE,
+      .cb = G_CALLBACK (gdbus_cb_model_delete_force),
+      .cb_data = NULL,
+      .handler_id = 0,
+  },
 };
 
 /**

diff --git a/daemon/service-db-util.h b/daemon/service-db-util.h
index 2a01809c923290b58dec7b0a4ccfde35a3d5be6d..e98bac088ae66f6c88ec1c6cb3aa73cc3f330175 100644 (file)
--- a/daemon/service-db-util.h
+++ b/daemon/service-db-util.h
@@ -29,6 +29,7 @@ gint svcdb_model_get (const gchar *name, const guint version, gchar **model_info
 gint svcdb_model_get_activated (const gchar *name, gchar **model_info);
 gint svcdb_model_get_all (const gchar *name, gchar **model_info);
 gint svcdb_model_delete (const gchar *name, const guint version);
+gint svcdb_model_delete_force (const gchar *name, const guint version, const gboolean force);
 gint svcdb_resource_add (const gchar *name, const gchar *path, const gchar *description, const gchar *app_info);
 gint svcdb_resource_get (const gchar *name, gchar **res_info);
 gint svcdb_resource_delete (const gchar *name);

diff --git a/daemon/service-db.cc b/daemon/service-db.cc
index f73cbbc4fd14cdd7ad88dcdbd4f0dc437866f6da..a82a21149edf51680674c0b2d9b002b5b3008474 100644 (file)
--- a/daemon/service-db.cc
+++ b/daemon/service-db.cc
@@ -675,9 +675,10 @@ MLServiceDB::get_model (const std::string name, const gint version, gchar **mode
  * @brief Delete the model.
  * @param[in] name The unique name to delete.
  * @param[in] version The version of the model to delete.
+ * @param[in] force The model to delete by force (default is false). 
  */
 void
-MLServiceDB::delete_model (const std::string name, const guint version)
+MLServiceDB::delete_model (const std::string name, const guint version, const gboolean force)
 {
   char *sql;
   sqlite3_stmt *res;
@@ -695,7 +696,10 @@ MLServiceDB::delete_model (const std::string name, const guint version)
   }
 
   if (version > 0U) {
-    if (is_model_activated (key_with_prefix, version))
+    if (force)
+      ml_logw ("The model with name %s and version %u may be activated, delete it from ml-service.",
+          name.c_str (), version);
+    else if (is_model_activated (key_with_prefix, version))
       throw std::invalid_argument ("The model with name " + name
                                    + " and version " + std::to_string (version)
                                    + " is activated, cannot delete it.");
@@ -1148,6 +1152,33 @@ svcdb_model_delete (const gchar *name, const guint version)
   return ret;
 }
 
+/**
+ * @brief Delete the model.
+ * @param[in] name The unique name to delete.
+ * @param[in] version The version of the model to delete.
+ * @param[in] force If the force is set to @c TRUE, the target model will be forced to delete.
+ * @return @c 0 on success. Otherwise a negative error value.
+ */
+gint
+svcdb_model_delete_force (const gchar *name, const guint version, const gboolean force)
+{
+  gint ret = 0;
+  MLServiceDB *db = svcdb_get ();
+
+  try {
+    db->delete_model (name, version, force);
+  } catch (const std::invalid_argument &e) {
+    ml_loge ("%s", e.what ());
+    ret = -EINVAL;
+  } catch (const std::exception &e) {
+    ml_loge ("%s", e.what ());
+    ret = -EIO;
+  }
+
+  return ret;
+}
+
+
 /**
  * @brief Set the resource with given name.
  * @param[in] name Unique name of ml-resource.

diff --git a/daemon/service-db.hh b/daemon/service-db.hh
index 00fba39b2843fa764f493d33963a71b32ed54f5f..221bbe03db8184618d015ccf8e8e4d425b7285a9 100644 (file)
--- a/daemon/service-db.hh
+++ b/daemon/service-db.hh
@@ -39,7 +39,8 @@ class MLServiceDB
       const guint version, const std::string description);
   virtual void activate_model (const std::string name, const guint version);
   virtual void get_model (const std::string name, const gint version, gchar **model);
-  virtual void delete_model (const std::string name, const guint version);
+  virtual void delete_model (
+      const std::string name, const guint version, const gboolean force = FALSE);
   virtual void set_resource (const std::string name, const std::string path,
       const std::string description, const std::string app_info);
   virtual void get_resource (const std::string name, gchar **resource);

diff --git a/dbus/model-dbus.xml b/dbus/model-dbus.xml
index 4f4258669acd833407e62311e9dadec73eae3732..62af5526e93be48fcfeb2a60721beee350b85633 100644 (file)
--- a/dbus/model-dbus.xml
+++ b/dbus/model-dbus.xml
@@ -49,5 +49,11 @@
       <arg type="u" name="version" direction="in" />
       <arg type="i" name="result" direction="out" />
     </method>
+    <method name="DeleteForce">
+      <arg type="s" name="name" direction="in" />
+      <arg type="u" name="version" direction="in" />
+      <arg type="b" name="force" direction="in" />
+      <arg type="i" name="result" direction="out" />
+    </method>
   </interface>
 </node>