Skip to content

Commit 317bb65

Browse files
authored
Merge pull request #2672 from alicevision/fix/externalMinFileWatcher
[ui] Graph: In minimal refresh, do not poll files for chunks run locally
2 parents 6ee3b01 + bae85d6 commit 317bb65

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

meshroom/ui/graph.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
class PollerRefreshStatus(Enum):
3939
AUTO_ENABLED = 0 # The file watcher polls every single status file periodically
4040
DISABLED = 1 # The file watcher is disabled and never polls any file
41-
MINIMAL_ENABLED = 2 # The file watcher only polls status files for chunks that are either submitted or running
41+
MINIMAL_ENABLED = 2 # The file watcher only polls status files for chunks that are either submitted or running externally
4242

4343

4444
class FilesModTimePollerThread(QObject):
@@ -183,10 +183,12 @@ def watchedStatusFiles(self):
183183
return self.statusFiles, self.monitorableChunks
184184
elif self.filePollerRefresh is PollerRefreshStatus.MINIMAL_ENABLED.value:
185185
for c in self.monitorableChunks:
186-
# When a chunk's status is ERROR, it may be externally re-submitted and it should thus still be monitored
187-
if c._status.status is Status.SUBMITTED or c._status.status is Status.RUNNING or c._status.status is Status.ERROR:
188-
files.append(c.statusFile)
189-
chunks.append(c)
186+
# Only chunks that are run externally should be monitored; when run locally, status changes are already notified
187+
if c.isExtern():
188+
# Chunks with an ERROR status may be re-submitted externally and should thus still be monitored
189+
if c._status.status is Status.SUBMITTED or c._status.status is Status.RUNNING or c._status.status is Status.ERROR:
190+
files.append(c.statusFile)
191+
chunks.append(c)
190192
return files, chunks
191193

192194
def compareFilesTimes(self, times):

0 commit comments

Comments
 (0)