diff --git a/src/log/logd/lgs_amf.cc b/src/log/logd/lgs_amf.cc
index 3f0de8c1c..1c424e50d 100644
--- a/src/log/logd/lgs_amf.cc
+++ b/src/log/logd/lgs_amf.cc
@@ -164,6 +164,7 @@ static SaAisErrorT amf_quiesced_state_handler(lgs_cb_t *cb,
   */
 
 
+  // [Canh] remove bank line
   mds_role = cb->mds_role;
   cb->mds_role = V_DEST_RL_QUIESCED;
   SaAisErrorT ais_rc = SA_AIS_OK;
diff --git a/src/log/logd/lgs_config.cc b/src/log/logd/lgs_config.cc
index 7be92a6fa..13a5d9cda 100644
--- a/src/log/logd/lgs_config.cc
+++ b/src/log/logd/lgs_config.cc
@@ -1798,6 +1798,8 @@ void conf_runtime_obj_handler(SaImmOiHandleT immOiHandle,
     } else if (!strcmp(attributeName, LOG_FILE_SYS_CONFIG)) {
       u32_val = *static_cast<const SaUint32T *>(
                     lgs_cfg_get(LGS_IMM_LOG_FILE_SYS_CONFIG));
+      // [Canh] How about the return of immutil_update_one_rattr() is BAD_HANDLE?
+      // There are many times that this function is called in lgs
       ais_rc = immutil_update_one_rattr(immOiHandle, LGS_CFG_RUNTIME_OBJECT,
                                         attributeName, SA_IMM_ATTR_SAUINT32T,
                                         &u32_val);
diff --git a/src/log/logd/lgs_evt.cc b/src/log/logd/lgs_evt.cc
index d0c3161a4..f529f78d3 100644
--- a/src/log/logd/lgs_evt.cc
+++ b/src/log/logd/lgs_evt.cc
@@ -962,6 +962,8 @@ SaAisErrorT create_new_app_stream(lgsv_stream_open_req_t *open_sync_param,
          __FUNCTION__, saf_error(ais_rc));
 
   if (ais_rc == SA_AIS_ERR_BAD_HANDLE) {
+    // [Canh] Should not call 'lgsOiCreateBackground' here because this function has
+    // done in lgs_create_appstream_rt_object() and 'log_stream_delete'
     lgsOiCreateBackground();
   }
 
diff --git a/src/log/logd/lgs_oi_admin.cc b/src/log/logd/lgs_oi_admin.cc
index 0063b5948..65f128a6f 100644
--- a/src/log/logd/lgs_oi_admin.cc
+++ b/src/log/logd/lgs_oi_admin.cc
@@ -343,6 +343,7 @@ static void createLogServerOi() {
              (ais_rc != SA_AIS_OK)) {
     LOG_WA("%s: Fail, OI creation timeout", __FUNCTION__);
     // The legacy behavior is to exit log service in this case
+    // [Canh] The content error message should be updated
     lgs_exit("saImmOiInitialize_2 failed", SA_AMF_COMPONENT_RESTART);
   } else if (ais_rc != SA_AIS_OK) {
     LOG_WA("%s: Fail, OI creation error", __FUNCTION__);
@@ -351,6 +352,9 @@ static void createLogServerOi() {
   }
 
   // Save OI handle and selection object
+  // [Canh] below function is just called when ais_rc is 'SA_AIS_ERR_NO_OP' (stop_oi_create)
+  // or 'SA_AIS_OK'. In case 'SA_AIS_ERR_NO_OP', this function should not be called,
+  // because the old oi_handle_ will be used to finalize in lgsOiStop()
   setProtectedGlobals(oi_handle, oi_selection_object);
 }