DBG - close channels

Author: mvollmer

Makefile

@@ -40,7 +40,7 @@ COCKPIT_REPO_FILES = \
 	$(NULL)
 
 COCKPIT_REPO_URL = https://github.com/cockpit-project/cockpit.git
-COCKPIT_REPO_COMMIT = dad4484037b14dda1f6040c52d314a3ba8bc5cc8 # 336 + a couple commits
+COCKPIT_REPO_COMMIT = 77facae6b8bf4ec98d5d278d5986b848340f4206 # 336 + a couple commits
 
 $(COCKPIT_REPO_FILES): $(COCKPIT_REPO_STAMP)
 COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT))^{tree}'

src/components/vm/consoles/serial.jsx

@@ -75,7 +75,7 @@ export class SerialActive extends React.Component {
     }
 
     componentDidMount() {
-        this.updateChannel(this.props.spawnArgs);
+        this.updateChannel();
     }
 
     componentDidUpdate(prevProps) {
@@ -84,8 +84,10 @@ export class SerialActive extends React.Component {
 
         const channel_needs_update = () => {
             if (newSpawnArgs.length !== oldSpawnArgs.length ||
-                oldSpawnArgs.some((arg, index) => arg !== newSpawnArgs[index]))
+                oldSpawnArgs.some((arg, index) => arg !== newSpawnArgs[index])) {
+                console.log("ARGS CHANGES", JSON.stringify({ old: oldSpawnArgs, new: newSpawnArgs }));
                 return true;
+            }
             if (this.props.state.connected && !this.state.channel)
                 return true;
             if (!this.props.state.connected && this.state.channel)
@@ -94,12 +96,20 @@ export class SerialActive extends React.Component {
         };
 
         if (channel_needs_update())
-            this.updateChannel(this.props.spawnArgs);
+            this.updateChannel();
     }
 
     updateChannel() {
-        if (this.state.channel)
+        console.log("CHANNEL UPDATE", JSON.stringify({
+            args: this.props.spawnArgs,
+            connected: this.props.state.connected,
+            has_channel: !!this.state.channel
+        }));
+
+        if (this.state.channel) {
+            console.log("UPDATE CLOSE", JSON.stringify(this.state.channel.options.spawn));
             this.state.channel.close();
+        }
 
         if (this.props.state.connected) {
             const opts = {
@@ -109,6 +119,7 @@ export class SerialActive extends React.Component {
             };
             if (this.props.connectionName == "system")
                 opts.superuser = "try";
+            console.log("UPDATE OPEN");
             const channel = cockpit.channel(opts);
             this.setState({ channel });
         } else {

test/check-machines-consoles

@@ -168,11 +168,17 @@ fullscreen=0
             b.wait(lambda: m.execute(
                 f'ps aux | grep \'virsh -c [q]emu:///system console vmWithSerialConsole {tag}{i}\''))  # noqa: B023
 
+        def console_channels():
+            output = m.execute("(ps aux | grep 'virsh -c [q]emu:///system console vmWithSerialConsole') || true")
+            print("CHANNELS", output)
+            return output
+
         # Verify that there is still at least one channel open
-        b.wait(lambda: m.execute("(ps aux | grep 'virsh -c [q]emu:///system console vmWithSerialConsole')"))
+        b.wait(lambda: console_channels() != "")
         # Navigating away from the details page should close all channels
+        print("MAIN")
         self.goToMainPage()
-        b.wait(lambda: m.execute("! (ps aux | grep 'virsh -c [q]emu:///system console vmWithSerialConsole')") == "")
+        b.wait(lambda: console_channels() == "")
 
         # disconnecting the serial console closes the pty channel
         self.allow_journal_messages("connection unexpectedly closed by peer",