From 2e6cb06c116d0f184403af2cfb2b4c6db6d8d583 Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Mon, 14 Nov 2016 17:49:35 -0600 Subject: [PATCH 1/4] Doc: libcrmcommon,libservices: correct license comments Copy-and-paste errors led to some library files having boilerplate referencing the GPL instead of LGPL. Correction confirmed with all authors. --- lib/common/cib_secrets.c | 19 +++---------------- lib/common/watchdog.c | 15 ++------------- lib/services/upstart.c | 22 ++-------------------- 3 files changed, 7 insertions(+), 49 deletions(-) diff --git a/lib/common/cib_secrets.c b/lib/common/cib_secrets.c index e17d3222f6c..9a565bffe83 100644 --- a/lib/common/cib_secrets.c +++ b/lib/common/cib_secrets.c @@ -1,22 +1,9 @@ /* - * cib_secrets.c - * - * Author: Dejan Muhamedagic * Copyright (c) 2011 SUSE, Attachmate + * Author: Dejan Muhamedagic * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * This source code is licensed under the GNU Lesser General Public License + * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY. */ #include diff --git a/lib/common/watchdog.c b/lib/common/watchdog.c index 31e6c8bb79d..0100b90672e 100644 --- a/lib/common/watchdog.c +++ b/lib/common/watchdog.c @@ -2,19 +2,8 @@ * Copyright (C) 2013 Lars Marowsky-Bree * 2014 Andrew Beekhof * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * This source code is licensed under the GNU Lesser General Public License + * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY. */ #include diff --git a/lib/services/upstart.c b/lib/services/upstart.c index 30573945d26..5651a147073 100644 --- a/lib/services/upstart.c +++ b/lib/services/upstart.c @@ -1,27 +1,9 @@ /* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * File: upstart-dbus.c * Copyright (C) 2010 Senko Rasic * Copyright (c) 2010 Ante Karamatic * - * - * Each exported function is standalone, and creates a new connection to - * the upstart daemon. This is because lrmd plugins fork off for exec, - * and if we try and share the connection, the whole thing blocks - * indefinitely. + * This source code is licensed under the GNU Lesser General Public License + * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY. */ #include From 4b8fa1fdff80701bf9f3155ce14bbbbba2fd0c87 Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Mon, 14 Nov 2016 17:53:13 -0600 Subject: [PATCH 2/4] Low: mcp,pacemaker_remote: order after time-sync Pacemaker can behave badly if the time jumps backward, so tell systemd to order it after any time synchronizers such as ntpdate. --- lrmd/pacemaker_remote.service.in | 1 + mcp/pacemaker.service.in | 1 + 2 files changed, 2 insertions(+) diff --git a/lrmd/pacemaker_remote.service.in b/lrmd/pacemaker_remote.service.in index 7e9b95021c9..6309ad26254 100644 --- a/lrmd/pacemaker_remote.service.in +++ b/lrmd/pacemaker_remote.service.in @@ -2,6 +2,7 @@ Description=Pacemaker Remote Service Documentation=man:pacemaker_remoted http://clusterlabs.org/doc/en-US/Pacemaker/1.1-pcs/html/Pacemaker_Remote/index.html After=network.target +After=time-sync.target [Install] WantedBy=multi-user.target diff --git a/mcp/pacemaker.service.in b/mcp/pacemaker.service.in index c5c031772c7..4d17b522459 100644 --- a/mcp/pacemaker.service.in +++ b/mcp/pacemaker.service.in @@ -7,6 +7,7 @@ After=basic.target After=syslog.service After=rsyslog.service After=network.target +After=time-sync.target After=corosync.service Requires=dbus.service From a145ce1df062dff61d7bab6d58f770cbce5f5dec Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Mon, 14 Nov 2016 17:57:41 -0600 Subject: [PATCH 3/4] Test: cts: fix patterns for verifying corosync kill --- cts/patterns.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cts/patterns.py b/cts/patterns.py index 886dbc590f3..3f9ac6f306d 100644 --- a/cts/patterns.py +++ b/cts/patterns.py @@ -305,11 +305,11 @@ def __init__(self, name): self.components["corosync"] = [ r"pacemakerd.*error:.*Connection destroyed", r"attrd.*:\s*crit:.*Lost connection to Corosync service", - r"stonith.*:\s*Corosync connection terminated", + r"stonith.*:\s*(Corosync connection terminated|Shutting down)", r"cib.*:\s*Corosync connection lost!\s+Exiting.", - r"crmd.*:\s*connection terminated", + r"crmd.*:\s*(connection terminated|Disconnected from Corosync)", r"pengine.*Scheduling Node .* for STONITH", - r"crmd.*:\s*Peer %s was terminated \(.*\) by .* for .*:\s*OK", + r"crmd.*:\s*Peer .* was terminated \(.*\) by .* for .*:\s*OK", ] self.components["cib-ignore"] = [ From 9a871a3e562250acf36f348aa259158f6acf4362 Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Wed, 16 Nov 2016 17:45:06 -0600 Subject: [PATCH 4/4] Doc: update change log for 1.1.16-rc2 --- ChangeLog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 905f22ec69b..debee983a37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +* Wed Nov 16 2016 Ken Gaillot Pacemaker-1.1.16-1 +- Update source tarball to revision: a145ce1 +- Changesets: 9 +- Diff: 12 files changed, 40 insertions(+), 56 deletions(-) + +- Changes since Pacemaker-1.1.16-rc1 + + Fix minor build issue + + Correct license specified for some library source files to LGPL + + systemd: order pacemaker after time-sync target + + * Thu Nov 03 2016 Ken Gaillot Pacemaker-1.1.16-rc1 - Update source tarball to revision: 2fc4716 - Changesets: 360