qemu_guest_agent: Update shutdown() #1391

xiangchunfu · 2018-03-08T11:36:04Z

guest_agent: Update shutdown()

Currently, shutdown() returns "{}" or no response after sending the shutdown command,
remove success_resp=False option to raise error message,and remove useless
"return True" and ignore VAgentProtocolErro at the same time.

ID: 1468530, 1476648

Signed-off-by: Xiangchun Fu xfu@redhat.com

xiangchunfu · 2018-03-08T14:52:16Z

(1/2) smp_8.8192m.repeat1.run_test.Host_RHEL.m7.u3.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.7.4.x86_64.myprovider.qemu_guest_agent.virtio_serial.check_reset_reboot_shutdown_fsfreeze: PASS (98.68 s)
(2/2) smp_8.8192m.repeat1.run_test.Host_RHEL.m7.u3.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.7.4.x86_64.myprovider.qemu_guest_agent.isa_serial.check_reset_reboot_shutdown_fsfreeze: PASS (88.30 s)

xiangchunfu · 2018-03-08T14:52:39Z

tp-qemu patch
autotest/tp-qemu#1032

lijinlijin · 2018-03-14T06:16:57Z

virttest/guest_agent.py

-        self.cmd(cmd=cmd, args=args, success_resp=False)
+        try:
+            self.cmd(cmd=cmd, args=args, success_resp=True)
+        except VAgentCmdError:


better return the detailed error msg for debugging usage.

@lijinlijin It will return "The command xxx has been disabled for this instance" error msg when executing shutdown. This msg is from VAgentCmdError, VAgentCmdError depend on qemu monitor. Do you wish like this "except 'The command xxx has been disabled for this instance'": ?

@lijinlijin In order to tp-qemu can get this error Msg, raise this error Msg.

If you need to check the content of the error message in your test context, here should let self.cmd() raise the VAgentCmdError directly instead of catching it and returning False.

So finally the code would be:

- self.cmd(cmd=cmd, args=args, success_resp=False) - return True + self.cmd(cmd=cmd, args=args)

@luckyh You are right, cmd() can raise this Error. I have updated it and re-tested it.

(1/2) Host_RHEL.m7.u6.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.7.6.x86_64.io-github-autotest-qemu.qemu_guest_agent.virtio_serial.check_reset_reboot_shutdown_fsfreeze: PASS (124.79 s)
(2/2) Host_RHEL.m7.u6.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.7.6.x86_64.io-github-autotest-qemu.qemu_guest_agent.isa_serial.check_reset_reboot_shutdown_fsfreeze: PASS (143.99 s)

luckyh · 2018-03-29T09:01:19Z

virttest/guest_agent.py

+        try:
+            self.cmd(cmd=cmd, args=args, success_resp=True)
+        except VAgentCmdError:
+            raise


The above approach has the same meaning as self.cmd(cmd=cmd, args=args, success_resp=True), the problem is there are several types of error but only some of them would not be allowed.

@luckyh I need to cautch this VAgentCmdError's output. when excepting VAgentCmdError, In order not to interrupt this function. I only replace raise with str(e).

xiangchunfu

@luckyh return False as below

```
   except VAgentCmdError as e:
```
```
       str(e)
```
```
       return False
```

(1/2) smp_4.1024m.repeat1.run_test.Host_RHEL.m7.u5.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.7.4.x86_64.io-github-autotest-qemu.qemu_guest_agent.virtio_serial.check_reset_reboot_shutdown_fsfreeze: PASS (81.91 s)
(2/2) smp_4.1024m.repeat1.run_test.Host_RHEL.m7.u5.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.7.4.x86_64.io-github-autotest-qemu.qemu_guest_agent.isa_serial.check_reset_reboot_shutdown_fsfreeze: PASS (81.57 s)

xiangchunfu · 2018-03-29T17:35:56Z

virttest/guest_agent.py

+        try:
+            self.cmd(cmd=cmd, args=args, success_resp=True)
+        except VAgentCmdError:
+            raise


@luckyh I need to cautch this VAgentCmdError's output. when excepting VAgentCmdError, In order not to interrupt this function. I only replace raise with str(e).

hereischen · 2018-08-01T05:42:08Z

virttest/guest_agent.py

+            self.cmd(cmd=cmd, args=args, success_resp=True)
+        except VAgentCmdError as e:
+            str(e)
+            return False


Based on autotest/tp-qemu#1032

except VAgentCmdError: return False

would be enough.

Can you explain what str(e) is for on line 515

@hereischen You are right, Don't need "str(e)". (original idea was to use str(e) to call str(self) method in Class VAgentCmdError).

vivianQizhu

ACK

luckyh · 2018-08-22T04:44:17Z

@xiangchunfu the code looks good to me now, but I still request a sensible commit message, thanks.

vivianQizhu · 2018-09-20T02:52:41Z

@luckyh Would you please check if the commit message proper and help merge it if so? Thanks.

luckyh · 2018-09-21T06:58:32Z

virttest/guest_agent.py

@@ -509,8 +509,7 @@ def shutdown(self, mode=SHUTDOWN_MODE_POWERDOWN):
        if mode in [self.SHUTDOWN_MODE_POWERDOWN, self.SHUTDOWN_MODE_REBOOT,
                    self.SHUTDOWN_MODE_HALT]:
            args = {"mode": mode}
-        self.cmd(cmd=cmd, args=args, success_resp=False)
-        return True
+        self.cmd(cmd=cmd, args=args)


Just realized that it should ignore the error that there is no response after sending the command, so you should catch VAgentProtocolError and ignore it at here.

@luckyh You are right, I have updated.

Currently, shutdown() returns "{}" or no response after sending the shutdown command, remove success_resp=False option to raise error message,and remove useless "return True" and ignore VAgentProtocolErro at the same time. Signed-off-by: Xiangchun Fu <xfu@redhat.com>

luckyh

ACK

xiangchunfu force-pushed the guest_agent_shutdown branch from 0b11c66 to 2ef134d Compare March 8, 2018 11:42

xiangchunfu mentioned this pull request Mar 8, 2018

qemu_guest_agent: add new guest agent case autotest/tp-qemu#1032

Merged

lijinlijin reviewed Mar 14, 2018

View reviewed changes

xiangchunfu force-pushed the guest_agent_shutdown branch from 2ef134d to a299214 Compare March 22, 2018 02:17

luckyh reviewed Mar 29, 2018

View reviewed changes

xiangchunfu force-pushed the guest_agent_shutdown branch 2 times, most recently from 4417434 to bb8a351 Compare March 30, 2018 07:21

xiangchunfu commented Mar 30, 2018

View reviewed changes

hereischen suggested changes Aug 1, 2018

View reviewed changes

xiangchunfu force-pushed the guest_agent_shutdown branch 2 times, most recently from 8db4d55 to f8c4ce4 Compare August 20, 2018 07:21

vivianQizhu approved these changes Aug 20, 2018

View reviewed changes

hereischen approved these changes Aug 20, 2018

View reviewed changes

xiangchunfu force-pushed the guest_agent_shutdown branch from f8c4ce4 to df465d6 Compare August 22, 2018 03:09

xiangchunfu force-pushed the guest_agent_shutdown branch from df465d6 to 7b768f1 Compare August 22, 2018 06:33

xiangchunfu changed the title ~~qemu_guest_agent: send agent shutdown command when guest FS is freezed~~ qemu_guest_agent: Catch agent shutdown command return value Aug 22, 2018

xiangchunfu force-pushed the guest_agent_shutdown branch 2 times, most recently from b6caf4d to 30c1bf0 Compare August 23, 2018 06:41

xiangchunfu changed the title ~~qemu_guest_agent: Catch agent shutdown command return value~~ qemu_guest_agent: fix agent shutdown() return Null value Aug 23, 2018

xiangchunfu force-pushed the guest_agent_shutdown branch 2 times, most recently from f9cad87 to fee5f09 Compare August 27, 2018 05:14

xiangchunfu changed the title ~~qemu_guest_agent: fix agent shutdown() return Null value~~ qemu_guest_agent: Update shutdown() Aug 28, 2018

xiangchunfu force-pushed the guest_agent_shutdown branch 5 times, most recently from 7d7df45 to cf95c17 Compare September 20, 2018 02:41

luckyh reviewed Sep 21, 2018

View reviewed changes

xiangchunfu force-pushed the guest_agent_shutdown branch from cf95c17 to 5e05837 Compare September 21, 2018 10:00

xiangchunfu force-pushed the guest_agent_shutdown branch from 5e05837 to 24accd0 Compare September 21, 2018 10:05

luckyh approved these changes Sep 21, 2018

View reviewed changes

luckyh merged commit 2740da4 into avocado-framework:master Sep 21, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

qemu_guest_agent: Update shutdown() #1391

qemu_guest_agent: Update shutdown() #1391

xiangchunfu commented Mar 8, 2018 •

edited

xiangchunfu commented Mar 8, 2018

xiangchunfu commented Mar 8, 2018

lijinlijin Mar 14, 2018

xiangchunfu Mar 15, 2018

xiangchunfu Mar 22, 2018

luckyh Aug 21, 2018

xiangchunfu Aug 22, 2018

luckyh Mar 29, 2018

xiangchunfu Mar 29, 2018

xiangchunfu left a comment

xiangchunfu Mar 29, 2018

hereischen Aug 1, 2018

xiangchunfu Aug 20, 2018

vivianQizhu left a comment

luckyh commented Aug 22, 2018

vivianQizhu commented Sep 20, 2018

luckyh Sep 21, 2018

xiangchunfu Sep 21, 2018

luckyh left a comment

qemu_guest_agent: Update shutdown() #1391

qemu_guest_agent: Update shutdown() #1391

Conversation

xiangchunfu commented Mar 8, 2018 • edited

xiangchunfu commented Mar 8, 2018

xiangchunfu commented Mar 8, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

xiangchunfu left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vivianQizhu left a comment

Choose a reason for hiding this comment

luckyh commented Aug 22, 2018

vivianQizhu commented Sep 20, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

luckyh left a comment

Choose a reason for hiding this comment

xiangchunfu commented Mar 8, 2018 •

edited