[poed]Change timestamp calculate method and blocking action in cfg save/load

1. Change timestamp calculate method in unix timestamp format
2. When using the poecli cfg save/load function, user must wait poe agent
   until the chip state or runtime cfg updated.
3. Check ipc file (/run/poe_ipc_event) before open it, make sure it's named pipe.

Signed-off-by: leon.chiang <[email protected]>

Author: leonchiang

dentos-poe-agent/opt/poeagent/bin/poecli.py

@@ -24,6 +24,7 @@
 import imp
 import sys
 import subprocess
+import stat
 import os
 import argparse
 import time
@@ -422,8 +423,13 @@ def is_poed_alive(self):
 
     def send_ipc_event(self, action=POECLI_SET):
         try:
-            with open(POE_IPC_EVT, "w") as f:
-                f.write(action)
+            if check_file(POE_IPC_EVT) == True:
+                if stat.S_ISFIFO(os.stat(POE_IPC_EVT).st_mode) == False:
+                    print_stderr(
+                        "Invalid IPC channel: {0}".format(POE_IPC_EVT))
+                    return
+                with open(POE_IPC_EVT, "w") as f:
+                    f.write(action)
         except Exception as e:
             pass
 
@@ -500,7 +506,15 @@ def main(argv):
     if set_flag == True and poed_alive == True:
         poecli.send_ipc_event()
     elif len(cfg_action)>0 and poed_alive == True:
+        touch_file(POED_BUSY_FLAG)
         poecli.send_ipc_event(cfg_action)
+        if wait_poed_busy(title="Wait cfg action", timeout=SAVE_FILE_TIMEOUT) == True:
+            print_stderr("done")
+        if check_file(POED_BUSY_FLAG):
+            remove_file(POED_BUSY_FLAG)
+
+
+
 
 if __name__ == '__main__':
     main(sys.argv)

dentos-poe-agent/opt/poeagent/bin/poed.py

@@ -21,6 +21,7 @@
 
 from pathlib import Path
 import os
+import stat
 import sys
 import errno
 import threading
@@ -82,13 +83,15 @@ def is_valid_gen_info(self, gen_info):
                self.is_valid_poe_cfg_ver(gen_info[POE_CFG_VER])
 
     def is_increasing_time_sequence(self, t1, t2):
-        tDelta = datetime.strptime(t2, TIME_FMT) - \
-                 datetime.strptime(t1, TIME_FMT)
-        result1 =(tDelta.days > 0 or tDelta.seconds > 0)
-        result2 =(tDelta.days * tDelta.seconds) >= 0
-        # print_stderr("is_increasing_time_sequence(self, t1, t2): result1={0},result2={1} ".format(str(result1),
-        #   str(result2)))
-        return result1 and result2
+        unixtime1 = time.mktime(datetime.strptime(t1, TIME_FMT).timetuple())
+        unixtime2 = time.mktime(datetime.strptime(t2, TIME_FMT).timetuple())
+        unixtime_diff = unixtime2-unixtime1
+        # print_stderr(
+        #     "unixtime diff: {0}-{1}={2}".format(unixtime2, unixtime1, (unixtime2-unixtime1)))
+        if unixtime_diff >=0:
+            return True
+        else:
+            return False
     def is_valid_timestamp(self, timestamp):
         last_save_time = timestamp[LAST_SAVE_TIME]
         last_set_time = timestamp[LAST_SET_TIME]
@@ -312,6 +315,7 @@ def save_curerent_runtime(self):
             copyfile(self.runtime_cfg.path(),
                      self.permanent_cfg.path())
 
+
     def autosave_main(self):
         global thread_flag
         self.log.info("Start autosave thread")
@@ -320,6 +324,7 @@ def autosave_main(self):
         while thread_flag is True:
             try:
                 if self.rt_counter >= self.cfg_update_intvl_rt:
+                    # print_stderr("Load chip state")
                     cfg_data = self.collect_running_state()
                     if self.failsafe_flag == False:
                         if self.save_poe_cfg(self.runtime_cfg, cfg_data) == True:
@@ -413,11 +418,17 @@ def get_poe_agent_stae(self):
         return self.poe_agent_state
 
     def create_poe_set_ipc(self):
+        try:
+            if Path(POE_IPC_EVT).exists() and stat.S_ISFIFO(os.stat(POE_IPC_EVT).st_mode) == False:
+                #Remove non-namedpipe file
+                remove_file(POE_IPC_EVT)
+        except:
+            pass
         try:
             os.mkfifo(POE_IPC_EVT)
         except OSError as oe:
             if oe.errno != errno.EEXIST:
-                self.log.err("Failed to open named pipe: %s" % str(e))
+                self.log.err("Failed to open named pipe: %s" % str(oe))
 
 def get_prev_pid():
     return int(open(POED_PID_PATH, 'r').read())
@@ -504,10 +515,10 @@ def main(argv):
                         if data == POECLI_SET:
                             pa.update_set_time()
                             pa.log.info("Receive a set event from poecli!")
-                            if pa.rt_counter <pa.cfg_update_intvl_rt:
-                                pa.log.info("Reset rt_counter timing: {0}".format(
-                                    str(pa.cfg_update_intvl_rt)))
-                                pa.rt_counter = pa.cfg_update_intvl_rt
+                            # if pa.rt_counter <pa.cfg_update_intvl_rt:
+                            pa.log.info("Reset rt_counter timing: {0}".format(
+                                str(pa.cfg_update_intvl_rt-1)))
+                            pa.rt_counter = pa.cfg_update_intvl_rt-1
                             break
                         elif data == POECLI_CFG:
                             pa.log.info("Receive a cfg event from poecli!")
@@ -524,6 +535,15 @@ def main(argv):
                                         apply = data_list[3]
                                         pa.log.info("CFG Apply: {0}".format(apply))
                                 if action==POED_SAVE_ACTION:
+                                    touch_file(POED_BUSY_FLAG)
+                                    pa.rt_counter = 0
+                                    cfg_data = pa.collect_running_state()
+                                    if pa.save_poe_cfg(pa.runtime_cfg, cfg_data) == True:
+                                        pa.log.info(
+                                            "Load chip state to runtime completed.")
+                                    else:
+                                        pa.log.warn(
+                                            "Failed to save cfg data in autosave routine!")
                                     if file == None:
                                         pa.log.info(
                                             "CFG Save: Save runtime setting to persistent file")
@@ -533,16 +553,19 @@ def main(argv):
                                                  file)
                                         pa.log.info(
                                             "CFG Save: Save runtime setting to {0}".format(file))
-                                elif action==POED_LOAD_ACTION:
+                                    remove_file(POED_BUSY_FLAG)
+                                elif action == POED_LOAD_ACTION:
                                     if file == None:
                                         pa.log.info(
                                             "CFG Load: Load persistent file")
                                         result = pa.load_poe_cfg(pa.permanent_cfg)
+                                        remove_file(POED_BUSY_FLAG)
                                     else:
                                         pa.log.info(
                                             "CFG Load: Load cfg file from {0}".format(file))
                                         temp_cfg = PoeConfig(file, pa.plat_name)
                                         result = pa.load_poe_cfg(temp_cfg)
+                                        remove_file(POED_BUSY_FLAG)
                                     if result == True:
                                         pa.update_set_time()
                                 break

dentos-poe-agent/opt/poeagent/inc/poe_common.py

@@ -111,6 +111,7 @@
 POED_BUSY_FLAG = "/run/.poed_busy"
 POED_EXIT_FLAG = "/run/.poed_exit"
 FILEFLAG_RETRY = 5
+SAVE_FILE_TIMEOUT = 20
 
 def print_stderr(msg,end="\n",flush=True):
     sys.stderr.write(msg+end)
@@ -228,15 +229,17 @@ def check_file(file_path):
         return False
 
 
-def wait_poed_busy(timeout=FILEFLAG_RETRY):
+def wait_poed_busy(timeout=FILEFLAG_RETRY, title="poe agent busy"):
     ret = check_file(POED_BUSY_FLAG)
+    if ret == True:
+        print_stderr("\r"+title+".", end='')
     while ret == True:
         ret = check_file(POED_BUSY_FLAG)
-        print_stderr("\rpoe agent busy...")
         if timeout > 0:
+            print_stderr(".", end='')
             timeout -= 1
         else:
-            print_stderr("\r\rpoe agent busy...timeout")
+            print_stderr("timeout")
             return False
         time.sleep(1)
     return True