Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2022-08-23 14:29:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "crmsh"
Tue Aug 23 14:29:54 2022 rev:253 rq:998748 version:4.4.1+20220822.c2f5d204
Changes:
--------
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-08-11
18:33:15.822202830 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2083/crmsh.changes 2022-08-23
14:30:17.807694134 +0200
@@ -1,0 +2,19 @@
+Tue Aug 23 01:26:47 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220822.c2f5d204:
+ * fix: configure: refresh cib before showing or modifying if no pending
changes has been made (bsc#1202465)
+
+-------------------------------------------------------------------
+Mon Aug 22 02:01:36 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220822.10c65b3b:
+ * Revert "Dev: testcases: Update expected testcase with pacemaker update"
+ * Dev: CI: master branch change to use opensuse/leap:15.4 as docker image
+
+-------------------------------------------------------------------
+Fri Aug 12 08:25:29 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220812.5acffe48:
+ * Dev: behave: Increase wait time for resource started
+
+-------------------------------------------------------------------
Old:
----
crmsh-4.4.1+20220811.e3a59fc7.tar.bz2
New:
----
crmsh-4.4.1+20220822.c2f5d204.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ crmsh.spec ++++++
--- /var/tmp/diff_new_pack.BL7B31/_old 2022-08-23 14:30:20.683700146 +0200
+++ /var/tmp/diff_new_pack.BL7B31/_new 2022-08-23 14:30:20.687700154 +0200
@@ -36,7 +36,7 @@
Summary: High Availability cluster command-line interface
License: GPL-2.0-or-later
Group: %{pkg_group}
-Version: 4.4.1+20220811.e3a59fc7
+Version: 4.4.1+20220822.c2f5d204
Release: 0
URL: http://crmsh.github.io
Source0: %{name}-%{version}.tar.bz2
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.BL7B31/_old 2022-08-23 14:30:20.727700238 +0200
+++ /var/tmp/diff_new_pack.BL7B31/_new 2022-08-23 14:30:20.731700246 +0200
@@ -9,7 +9,7 @@
</service>
<service name="tar_scm">
<param name="url">https://github.com/ClusterLabs/crmsh.git</param>
- <param
name="changesrevision">e3a59fc7fda76339197455c477df102048ede726</param>
+ <param
name="changesrevision">1be81833f51a3d83b3329085cec5ab19f1957ef4</param>
</service>
</servicedata>
(No newline at EOF)
++++++ crmsh-4.4.1+20220811.e3a59fc7.tar.bz2 ->
crmsh-4.4.1+20220822.c2f5d204.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220811.e3a59fc7/Dockerfile
new/crmsh-4.4.1+20220822.c2f5d204/Dockerfile
--- old/crmsh-4.4.1+20220811.e3a59fc7/Dockerfile 2022-08-11
13:53:08.000000000 +0200
+++ new/crmsh-4.4.1+20220822.c2f5d204/Dockerfile 2022-08-22
07:51:44.000000000 +0200
@@ -1,12 +1,12 @@
-FROM opensuse/tumbleweed
+FROM opensuse/leap:15.4
MAINTAINER Xin Liang <xli...@suse.com>
ARG ssh_prv_key
ARG ssh_pub_key
-# docker build -t hatbw --build-arg ssh_prv_key="$(cat /root/.ssh/id_rsa)"
--build-arg ssh_pub_key="$(cat /root/.ssh/id_rsa.pub)" .
+# docker build -t haleap --build-arg ssh_prv_key="$(cat /root/.ssh/id_rsa)"
--build-arg ssh_pub_key="$(cat /root/.ssh/id_rsa.pub)" .
# docker login
-# docker tag hatbw liangxin1300/hatbw
-# docker push liangxin1300/hatbw
+# docker tag haleap liangxin1300/haleap:15.4
+# docker push liangxin1300/haleap:15.4
RUN zypper ref
RUN zypper -n install systemd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220811.e3a59fc7/crmsh/cibconfig.py
new/crmsh-4.4.1+20220822.c2f5d204/crmsh/cibconfig.py
--- old/crmsh-4.4.1+20220811.e3a59fc7/crmsh/cibconfig.py 2022-08-11
13:53:08.000000000 +0200
+++ new/crmsh-4.4.1+20220822.c2f5d204/crmsh/cibconfig.py 2022-08-22
07:51:44.000000000 +0200
@@ -3254,6 +3254,10 @@
return False
return self.modified_elems() or self.remove_queue
+ def ensure_cib_updated(self):
+ if options.interactive and not self.has_cib_changed():
+ self.refresh()
+
def _verify_constraints(self, node):
'''
Check if all resources referenced in a constraint exist
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220811.e3a59fc7/crmsh/ui_configure.py
new/crmsh-4.4.1+20220822.c2f5d204/crmsh/ui_configure.py
--- old/crmsh-4.4.1+20220811.e3a59fc7/crmsh/ui_configure.py 2022-08-11
13:53:08.000000000 +0200
+++ new/crmsh-4.4.1+20220822.c2f5d204/crmsh/ui_configure.py 2022-08-22
07:51:44.000000000 +0200
@@ -514,6 +514,7 @@
@command.name('_test')
@command.skill_level('administrator')
def do_check_structure(self, context):
+ cib_factory.ensure_cib_updated()
return cib_factory.check_structure()
@command.name('_regtest')
@@ -569,6 +570,7 @@
# regrex here also filter out possible spaces
osargs = re.split('\s*\|\s*|\s+',
config.core.obscure_pattern.strip('|'))
args = [arg for arg in args if not arg.startswith('obscure:')]
+ cib_factory.ensure_cib_updated()
with obscure(osargs):
set_obj = mkset_obj(*args)
return set_obj.show()
@@ -591,6 +593,7 @@
print(utils.canonical_boolean(v))
else:
print(v)
+ cib_factory.ensure_cib_updated()
for p in properties:
v = cib_factory.get_property_w_default(p)
if v is not None:
@@ -604,6 +607,7 @@
@command.completers_repeating(compl.null, _id_xml_list, _id_list)
def do_filter(self, context, filterprog, *args):
"usage: filter <prog> [xml] [<id>...]"
+ cib_factory.ensure_cib_updated()
set_obj = mkset_obj(*args)
return set_obj.filter(filterprog)
@@ -620,6 +624,7 @@
if len(path_list) < 2 or len(path_list) > 4:
context.fatal_error(path_errmsg)
+ cib_factory.ensure_cib_updated()
obj_id, *other_path_list = path_list
rsc = cib_factory.find_object(obj_id)
if not rsc:
@@ -676,6 +681,7 @@
len(args))
after_before = args[0]
ref_member_id = args[1]
+ cib_factory.ensure_cib_updated()
g = cib_factory.find_object(group_id)
if not g:
context.fatal_error("group %s does not exist" % group_id)
@@ -708,6 +714,7 @@
@command.completers_repeating(_id_xml_list, _id_list)
def do_edit(self, context, *args):
"usage: edit [xml] [<id>...]"
+ cib_factory.ensure_cib_updated()
with logger_utils.buffer(): # keep error messages
set_obj = mkset_obj(*args)
return set_obj.edit()
@@ -723,6 +730,7 @@
@command.skill_level('administrator')
def do_verify(self, context):
"usage: verify"
+ cib_factory.ensure_cib_updated()
set_obj_all = mkset_obj("xml")
return self._verify(set_obj_all, set_obj_all)
@@ -732,6 +740,7 @@
@command.completers_repeating(_id_list)
def do_validate_all(self, context, rsc):
"usage: validate-all <rsc>"
+ cib_factory.ensure_cib_updated()
from . import ra
from . import cibconfig
from . import cliformat
@@ -761,6 +770,7 @@
"usage: save [xml] [<id>...] <filename>"
if not args:
context.fatal_error("Expected 1 argument (0 given)")
+ cib_factory.ensure_cib_updated()
filename = args[-1]
setargs = args[:-1]
set_obj = mkset_obj(*setargs)
@@ -786,6 +796,7 @@
xml = False
if method not in ("replace", "update", "push"):
context.fatal_error("Unknown method %s" % method)
+ cib_factory.ensure_cib_updated()
if method == "replace":
if options.interactive and cib_factory.has_cib_changed():
if not utils.ask("This operation will erase all changes. Do
you want to proceed?"):
@@ -803,6 +814,7 @@
"usage: graph [<gtype> [<file> [<img_format>]]]"
if args and args[0] == "exportsettings":
return utils.save_graphviz_file(userdir.GRAPHVIZ_USER_FILE,
constants.graph)
+ cib_factory.ensure_cib_updated()
set_obj = mkset_obj()
rc = set_obj.query_graph(*args)
if rc is None:
@@ -832,6 +844,7 @@
if arg_force or config.core.force:
if self._stop_if_running(argl) > 0:
utils.wait4dc(what="Stopping %s" % (", ".join(argl)))
+ cib_factory.ensure_cib_updated()
return cib_factory.delete(*argl)
@command.name('default-timeouts')
@@ -839,18 +852,21 @@
@command.completers_repeating(_id_list)
def do_default_timeouts(self, context, *args):
"usage: default-timeouts <id> [<id>...]"
+ cib_factory.ensure_cib_updated()
return cib_factory.default_timeouts(*args)
@command.skill_level('administrator')
@command.completers(_id_list)
def do_rename(self, context, old_id, new_id):
"usage: rename <old_id> <new_id>"
+ cib_factory.ensure_cib_updated()
return cib_factory.rename(old_id, new_id)
@command.skill_level('administrator')
@command.completers(compl.choice(['nodes']))
def do_erase(self, context, nodes=None):
"usage: erase [nodes]"
+ cib_factory.ensure_cib_updated()
if nodes is None:
return cib_factory.erase()
if nodes != 'nodes':
@@ -918,6 +934,7 @@
"usage: upgrade [force]"
if force and force != "force":
context.fatal_error("Expected 'force' or no argument")
+ cib_factory.ensure_cib_updated()
return cib_factory.upgrade_validate_with(force=config.core.force or
force)
@command.skill_level('administrator')
@@ -962,6 +979,7 @@
not cib_factory.is_elem_supported(cmd):
logger.error("%s not supported by the RNG schema" % cmd)
return False
+ cib_factory.ensure_cib_updated()
if not args:
return cib_factory.create_object(cmd, *args)
if args[0].startswith("id="):
@@ -1176,6 +1194,7 @@
@command.completers_repeating(_rsc_id_list)
def do_rsctest(self, context, *args):
"usage: rsctest <rsc_id> [<rsc_id> ...] [<node_id> ...]"
+ cib_factory.ensure_cib_updated()
rc = True
rsc_l = []
node_l = []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.1+20220811.e3a59fc7/test/features/steps/step_implementation.py
new/crmsh-4.4.1+20220822.c2f5d204/test/features/steps/step_implementation.py
---
old/crmsh-4.4.1+20220811.e3a59fc7/test/features/steps/step_implementation.py
2022-08-11 13:53:08.000000000 +0200
+++
new/crmsh-4.4.1+20220822.c2f5d204/test/features/steps/step_implementation.py
2022-08-22 07:51:44.000000000 +0200
@@ -242,7 +242,7 @@
def step_impl(context, res, res_type, state):
try_count = 0
result = None
- while try_count < 5:
+ while try_count < 20:
time.sleep(1)
_, out = run_command(context, "crm_mon -1rR")
if out:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.1+20220811.e3a59fc7/test/run-functional-tests
new/crmsh-4.4.1+20220822.c2f5d204/test/run-functional-tests
--- old/crmsh-4.4.1+20220811.e3a59fc7/test/run-functional-tests 2022-08-11
13:53:08.000000000 +0200
+++ new/crmsh-4.4.1+20220822.c2f5d204/test/run-functional-tests 2022-08-22
07:51:44.000000000 +0200
@@ -1,6 +1,6 @@
#!/bin/bash
-DOCKER_IMAGE=${DOCKER_IMAGE:-"liangxin1300/hatbw"}
+DOCKER_IMAGE=${DOCKER_IMAGE:-"liangxin1300/haleap:15.4"}
DOCKER_SERVICE="docker.service"
COROSYNC_CONF="/etc/corosync/corosync.conf"
COROSYNC_AUTH="/etc/corosync/authkey"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220811.e3a59fc7/test/testcases/ra.exp
new/crmsh-4.4.1+20220822.c2f5d204/test/testcases/ra.exp
--- old/crmsh-4.4.1+20220811.e3a59fc7/test/testcases/ra.exp 2022-08-11
13:53:08.000000000 +0200
+++ new/crmsh-4.4.1+20220822.c2f5d204/test/testcases/ra.exp 2022-08-22
07:51:44.000000000 +0200
@@ -84,9 +84,11 @@
Use this to enable a random delay for fencing actions.
The overall delay is derived from this random delay value adding a static
delay so that the sum is kept below the maximum delay.
-pcmk_delay_base (string, [0s]): Enable a base delay for fencing actions and
specify base delay value.
- This enables a static delay for fencing actions, which can help avoid
"death matches" where two nodes try to fence each other at the same time. If
pcmk_delay_max is also used, a random delay will be added such that the total
delay is kept below that value.
- This can be set to a single time value to apply to any node targeted by
this device (useful if a separate device is configured for each target), or to
a node map (for example, "node1:1s;node2:5") to set a different value per
target.
+pcmk_delay_base (time, [0s]): Enable a base delay for fencing actions and
specify base delay value.
+ This prevents double fencing when different delays are configured on the
nodes.
+ Use this to enable a static delay for fencing actions.
+ The overall delay is derived from a random delay value adding this static
delay so that the sum is kept below the maximum delay.
+ Set to eg. node1:1s;node2:5 to set different value per node.
pcmk_action_limit (integer, [1]): The maximum number of actions can be
performed in parallel on this device
Cluster property concurrent-fencing=true needs to be configured first.
