[core] node: Remove static info from the chunks' status file

`nodeType` and `packageName` are already part of the node's status file,
and there is thus no need to propagate them to the chunks'.

Author: cbentejac

bin/meshroom_createChunks

@@ -99,7 +99,6 @@ if not node._chunksCreated:
     for chunk in node._chunks:
         if args.forceCompute or chunk._status.status != Status.SUCCESS:
             hasChunkToLaunch = True
-            chunk._status.setNode(node)
             chunk._status.initExternSubmit()
             chunk.upgradeStatusFile()
 

meshroom/core/node.py

@@ -65,7 +65,7 @@ class ExecMode(Enum):
 NodeChunkSetup = namedtuple("NodeChunks", ["blockSize", "fullSize", "nbBlocks"])
 
 class NodeStatusData(BaseObject):
-    __slots__ = ("nodeName", "status", "execMode", "nodeType", "packageName",
+    __slots__ = ("nodeName", "nodeType", "status", "execMode", "packageName",
                  "mrNodeType", "submitterSessionUid", "chunks", "jobInfo")
 
     def __init__(self, nodeName='', nodeType='', packageName='',
@@ -212,17 +212,14 @@ class ChunkStatusData(BaseObject):
     dateTimeFormatting = '%Y-%m-%d %H:%M:%S.%f'
 
     __slots__ = (
-        "nodeName", "nodeType", "packageName", "mrNodeType", "computeSessionUid", "execMode",
-        "status", "commandLine", "startDateTime", "endDateTime", "elapsedTime", "hostname"
+        "nodeName", "mrNodeType", "computeSessionUid", "execMode", "status",
+        "commandLine", "startDateTime", "endDateTime", "elapsedTime", "hostname"
     )
 
-    def __init__(self, nodeName='', nodeType='', packageName='',
-                 mrNodeType: MrNodeType = MrNodeType.NONE, parent: BaseObject = None):
+    def __init__(self, nodeName='', mrNodeType: MrNodeType = MrNodeType.NONE, parent: BaseObject = None):
         super().__init__(parent)
 
         self.nodeName: str = nodeName
-        self.nodeType: str = nodeType
-        self.packageName: str = packageName
         self.mrNodeType = mrNodeType
 
         self.computeSessionUid: Optional[str] = None    # Session where computation is done
@@ -240,19 +237,6 @@ def resetDynamicValues(self):
         self.elapsedTime: float = 0.0
         self.hostname: str = ""
 
-    def setNode(self, node):
-        """ Set the node information from one node instance. """
-        self.nodeName = node.name
-        self.setNodeType(node)
-
-    def setNodeType(self, node):
-        """
-        Set the node type and package information from the given node.
-        We do not set the name in this method as it may vary if there are duplicates.
-        """
-        self.nodeType = node.nodeType
-        self.packageName = node.packageName
-        self.mrNodeType = node.getMrNodeType()
 
     def merge(self, other):
         self.startDateTime = min(self.startDateTime, other.startDateTime)
@@ -261,8 +245,6 @@ def merge(self, other):
 
     def reset(self):
         self.nodeName: str = ""
-        self.nodeType: str = ""
-        self.packageName: str = ""
         self.mrNodeType: MrNodeType = MrNodeType.NONE
         self.execMode: ExecMode = ExecMode.NONE
         self.resetDynamicValues()
@@ -464,8 +446,7 @@ def __init__(self, node, range, parent=None):
         self.node = node
         self.range = range
         self._logManager = None
-        self._status: ChunkStatusData = ChunkStatusData(node.name, node.nodeType, node.packageName,
-                                                        node.getMrNodeType())
+        self._status: ChunkStatusData = ChunkStatusData(nodeName=node.name, mrNodeType=node.getMrNodeType())
         self.statistics: stats.Statistics = stats.Statistics()
         self.statusFileLastModTime = -1
         self.subprocess = None
@@ -527,7 +508,6 @@ def updateStatusFromCache(self):
         if not os.path.exists(statusFile):
             self.statusFileLastModTime = -1
             self._status.reset()
-            self._status.setNodeType(self.node)
         else:
             try:
                 with open(statusFile) as jsonFile:
@@ -539,7 +519,6 @@ def updateStatusFromCache(self):
                 logging.debug(f"updateStatusFromCache({self.node.name}): Error while loading status file {statusFile}: {exc}")
                 self.statusFileLastModTime = -1
                 self._status.reset()
-                self._status.setNodeType(self.node)
 
         if oldStatus != self._status.status:
             self.statusChanged.emit()
@@ -649,7 +628,6 @@ def process(self, forceCompute=False, inCurrentEnv=False):
             return
 
         runningProcesses[self.name] = self
-        self._status.setNode(self.node)
         self._status.initStartCompute()
         self.upgradeStatusFile()
         executionStatus = None
@@ -670,7 +648,6 @@ def process(self, forceCompute=False, inCurrentEnv=False):
             executionStatus = Status.STOPPED
             raise
         finally:
-            self._status.setNode(self.node)
             self._status.initEndCompute()
             self.upgradeStatusFile()
 
@@ -690,7 +667,6 @@ def _processInIsolatedEnvironment(self):
         configuration.
         """
         try:
-            self._status.setNode(self.node)
             self._status.initIsolatedCompute()
             self.upgradeStatusFile()
 
@@ -1589,7 +1565,6 @@ def initStatusOnSubmit(self, forceCompute=False):
         for chunk in self._chunks:
             if forceCompute or chunk._status.status != Status.SUCCESS:
                 hasChunkToLaunch = True
-                chunk._status.setNode(self)
                 chunk._status.initExternSubmit()
                 chunk.upgradeStatusFile()
         if hasChunkToLaunch:
@@ -1605,7 +1580,6 @@ def initStatusOnCompute(self, forceCompute=False):
         for chunk in self._chunks:
             if forceCompute or (chunk._status.status not in (Status.RUNNING, Status.SUCCESS)):
                 hasChunkToLaunch = True
-                chunk._status.setNode(self)
                 chunk._status.initLocalSubmit()
                 chunk.upgradeStatusFile()
         if hasChunkToLaunch: