[crmsh-4.6] Fix: ui_node: prevent traceback on node standby #1338
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
```
[root@es-3-virt1 ~]# rpm -qa | grep crmsh
crmsh-4.5.1-1.el8.noarch
crmsh-scripts-4.5.1-1.el8.noarch
crmsh-test-4.5.1-1.el8.noarch
[root@es-3-virt1 ~]# crm cluster stop
WARNING: crmsh configuration is inconsistent in cluster.
INFO: The cluster stack already stopped on es-3-virt1
[root@es-3-virt1 ~]# crm node standby
WARNING: crmsh configuration is inconsistent in cluster.
ERROR: running cibadmin -Ql: Could not connect to the CIB: Transport endpoint is not connected
Init failed, could not perform requested operations
Traceback (most recent call last):
File "/usr/sbin/crm", line 53, in <module>
rc = main.run()
File "/usr/lib/python3.6/site-packages/crmsh/main.py", line 369, in run
return main_input_loop(context, user_args)
File "/usr/lib/python3.6/site-packages/crmsh/main.py", line 247, in main_input_loop
rc = handle_noninteractive_use(context, user_args)
File "/usr/lib/python3.6/site-packages/crmsh/main.py", line 204, in handle_noninteractive_use
if context.run(' '.join(l)):
File "/usr/lib/python3.6/site-packages/crmsh/ui_context.py", line 86, in run
rv = self.execute_command() is not False
File "/usr/lib/python3.6/site-packages/crmsh/ui_context.py", line 271, in execute_command
rv = self.command_info.function(*arglist)
File "/usr/lib/python3.6/site-packages/crmsh/ui_node.py", line 397, in do_standby
xml_item_list = cib.xpath(xml_path)
AttributeError: 'NoneType' object has no attribute 'xpath'
[root@es-3-virt1 ~]# echo $?
1
[root@es-3-virt1 ~]# cp /usr/lib/python3.6/site-packages/crmsh/ui_node.py{,.orig}
[root@es-3-virt1 ~]# vim /usr/lib/python3.6/site-packages/crmsh/ui_node.py
[root@es-3-virt1 ~]# diff -Naru /usr/lib/python3.6/site-packages/crmsh/ui_node.py.orig /usr/lib/python3.6/site-packages/crmsh/ui_node.py
--- /usr/lib/python3.6/site-packages/crmsh/ui_node.py.orig 2024-01-08 14:43:49.166728433 +0000
+++ /usr/lib/python3.6/site-packages/crmsh/ui_node.py 2024-01-08 14:44:50.942622070 +0000
@@ -376,6 +376,8 @@
xml_query_path_oppsite = constants.XML_NODE_QUERY_STANDBY_PATH
cib = xmlutil.cibdump2elem()
+ if cib is None:
+ return False
# IMPORTANT:
# Do NOT call cibdump2elem twice, or you risk a race where the
# resulting diff will contain more changes than the values for
[root@es-3-virt1 ~]# crm node standby ; echo $?
WARNING: crmsh configuration is inconsistent in cluster.
ERROR: running cibadmin -Ql: Could not connect to the CIB: Transport endpoint is not connected
Init failed, could not perform requested operations
1
```
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## crmsh-4.6 #1338 +/- ##
=============================================
- Coverage 52.82% 52.82% -0.01%
=============================================
Files 79 79
Lines 24002 24006 +4
=============================================
+ Hits 12678 12680 +2
- Misses 11324 11326 +2 ☔ View full report in Codecov by Sentry. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
backport #1299