Merge ~rafaeldtinoco/ubuntu/+source/pacemaker:lp1881762-focal-backport into ubuntu/+source/pacemaker:ubuntu/focal-devel

[Rafael David Tinoco]

BUG: https://bugs.launchpad.net/ubuntu/+source/pacemaker/+bug/1881762
PPA: https://launchpad.net/~rafaeldtinoco/+archive/ubuntu/lp1881762

I would like @racb's review (SRU wise) before uploading as we've been discussing about this particular SRU.

[Rafael David Tinoco (rafaeldtinoco)]

I'll still finish testing over built packages, but for now everything seems alright. Will upload once the testcase is checked and also all the regression/functional tests.

[Robie Basak (racb)]

Looks good, thanks! This was much easier to review so I'm much more confident in checking that it looks correct and won't regress anything, and I think this approach meets the SRU "minimal fix" policy much better. Minor comments inline.

How well does the test case in the bug cover these three specific things being fixed? Can we make sure to cover all three, such that if one of the fixes doesn't work, we'll find that out at SRU verification time?

I think the Regression Potential section in the bug needs updating now with this different approach?

review: Needs Fixing

[Rafael David Tinoco (rafaeldtinoco)]

> Looks good, thanks! This was much easier to review so I'm much more confident
> in checking that it looks correct and won't regress anything, and I think this
> approach meets the SRU "minimal fix" policy much better. Minor comments
> inline.

I'll get into those next comment.

> How well does the test case in the bug cover these three specific things being
> fixed? Can we make sure to cover all three, such that if one of the fixes
> doesn't work, we'll find that out at SRU verification time?

1st patch: covered very well, original issue actually
2nd patch: its covered as a side effect in same test case (as 1st one would not work without it)
3rd patch: I don't see a clear way to test this without mocking things, but I see it as a very simple change that does not necessarily need to be tested aside (and it's related to 1st and 2nd).

> I think the Regression Potential section in the bug needs updating now with
> this different approach?

Updated with better description of potential regressions.

[Rafael David Tinoco (rafaeldtinoco)]

Okay, I'm addressing your comments and pushing this again in here. Thanks for the careful review again.

[Rafael David Tinoco (rafaeldtinoco)]

Please let me know if you're good so I can upload this. Thank you

[Robie Basak (racb)]

Looks good. Thanks! If you upload, I can accept into the proposed pocket immediately.

review: Approve (sru)

[Rafael David Tinoco (rafaeldtinoco)]

Awesome.. thanks a lot for all. Here is the output from the tests:

[rafaeldtinoco@focal01 ~]$ crm status
Cluster Summary:
  * Stack: corosync
  * Current DC: focal01 (version 2.0.3-4b1f869f0f) - partition with quorum
  * Last updated: Thu Oct 8 17:32:20 2020
  * Last change: Thu Oct 8 17:32:18 2020 by root via cibadmin on focal01
  * 3 nodes configured
  * 5 resource instances configured (2 DISABLED)

Node List:
  * Online: [ focal01 focal02 focal03 ]

Full List of Resources:
  * fence-focal01 (stonith:fence_virsh): Started focal02
  * fence-focal02 (stonith:fence_virsh): Started focal01
  * fence-focal03 (stonith:fence_virsh): Started focal02
  * Resource Group: webserver_vip:
    * webserver (systemd:lighttpd): Stopped (disabled)
    * virtual_ip (ocf::heartbeat:IPaddr2): Stopped (disabled)

----

[rafaeldtinoco@focal01 ~]$ crm resource start webserver_vip

----

[rafaeldtinoco@focal01 ~]$ crm status
Cluster Summary:
  * Stack: corosync
  * Current DC: focal01 (version 2.0.3-4b1f869f0f) - partition with quorum
  * Last updated: Thu Oct 8 17:32:14 2020
  * Last change: Thu Oct 8 17:32:11 2020 by root via cibadmin on focal01
  * 3 nodes configured
  * 5 resource instances configured

Node List:
  * Online: [ focal01 focal02 focal03 ]

Full List of Resources:
  * fence-focal01 (stonith:fence_virsh): Started focal02
  * fence-focal02 (stonith:fence_virsh): Started focal01
  * fence-focal03 (stonith:fence_virsh): Started focal02
  * Resource Group: webserver_vip:
    * webserver (systemd:lighttpd): Started focal03
    * virtual_ip (ocf::heartbeat:IPaddr2): Started focal03

----

A 2s timeout works as well. I'm going ahead and uploading it then.

[Rafael David Tinoco (rafaeldtinoco)]

[rafaeldtinoco@hafocal pacemaker]$ git describe
upload/2.0.3-3ubuntu4

[rafaeldtinoco@hafocal pacemaker]$ git push pkg upload/2.0.3-3ubuntu4
Enumerating objects: 25, done.
Counting objects: 100% (25/25), done.
Delta compression using up to 8 threads
Compressing objects: 100% (18/18), done.
Writing objects: 100% (18/18), 7.71 KiB | 3.86 MiB/s, done.
Total 18 (delta 11), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/pacemaker
 * [new tag] upload/2.0.3-3ubuntu4 -> upload/2.0.3-3ubuntu4

$ debdiff pacemaker_2.0.3-3ubuntu3.dsc pacemaker_2.0.3-3ubuntu4.dsc | diffstat -l
changelog
patches/series
patches/ubuntu-2.0.3-fixes/lp1881762-01-Executor-systemd-execution-time-fixes.patch
patches/ubuntu-2.0.3-fixes/lp1881762-02-Low-executor-record-correct-last-run-and-last-rc.patch
patches/ubuntu-2.0.3-fixes/lp1881762-03-Refactor-executor-functionize-getting-current.patch
rules

$ dput ubuntu pacemaker_2.0.3-3ubuntu4_source.changes
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading pacemaker_2.0.3-3ubuntu4.dsc: done.
  Uploading pacemaker_2.0.3-3ubuntu4.debian.tar.xz: done.
  Uploading pacemaker_2.0.3-3ubuntu4_source.buildinfo: done.
  Uploading pacemaker_2.0.3-3ubuntu4_source.changes: done.
Successfully uploaded packages.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index ff94693..31fbb41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+pacemaker (2.0.3-3ubuntu4) focal; urgency=medium
+
+  * Fix clock_gettime() timing functions (LP: #1881762)
+    + d/p/ubuntu-2.0.3-fixes/lp1881762-*:
+      - 01-Executor-systemd-execution-time-fixes.patch
+      - 02-Low-executor-record-correct-last-run-and-last-rc.patch
+      - 03-Refactor-executor-functionize-getting-current.patch
+
+ -- Rafael David Tinoco <[e-mail]>  Thu, 08 Oct 2020 05:38:22 +0000
+
 pacemaker (2.0.3-3ubuntu3) focal; urgency=medium
 
   * Post 2.0.3 release fixes backported to Ubuntu (LP: #1870235)
diff --git a/debian/patches/series b/debian/patches/series
index 0221c25..f539cbb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,10 @@ ubuntu-2.0.3-fixes/lp1870235-28bfd00e9-Low-libcrmservice-handle-child-wait-error
 ubuntu-2.0.3-fixes/lp1870235-dec326391-Log-libcrmcommon-correct-log-line-length.patch
 ubuntu-2.0.3-fixes/lp1870235-c98987824-Fix-iso8601-Fix-crm_time_parse_offset.patch
 ubuntu-2.0.3-fixes/lp1870235-426f06cc0-Fix-tools-Fix-curses_indented_printf.patch
+#
+# https://bugs.launchpad.net/bugs/1881762
+#
+ubuntu-2.0.3-fixes/lp1881762-01-Executor-systemd-execution-time-fixes.patch
+ubuntu-2.0.3-fixes/lp1881762-02-Low-executor-record-correct-last-run-and-last-rc.patch
+ubuntu-2.0.3-fixes/lp1881762-03-Refactor-executor-functionize-getting-current.patch
+
diff --git a/debian/patches/ubuntu-2.0.3-fixes/lp1881762-01-Executor-systemd-execution-time-fixes.patch b/debian/patches/ubuntu-2.0.3-fixes/lp1881762-01-Executor-systemd-execution-time-fixes.patch
new file mode 100644
index 0000000..4a1413b
--- /dev/null
+++ b/debian/patches/ubuntu-2.0.3-fixes/lp1881762-01-Executor-systemd-execution-time-fixes.patch
@@ -0,0 +1,167 @@
+Description: Executor: systemd execution time fixes
+
+ This patch is a backport of the following upstream patches:
+
+ 077229220 Fix: executor: handle systemd execution times under 1 second
+ c9ce7ed50 Low: executor: correctly set first run time
+ 08e3f7e44 Fix: executor: correctly convert nanoseconds to milliseconds
+
+ It fixes systemd resources execution times shorter than 1 second. They
+ were consolidated because last 2 patches are minor fixes to the first
+ one.
+
+ [Backport]
+
+ After SRU review it was decided that, instead of cherry-picking the 2
+ upstream merges pointed by upstream maintainer (#1992 and #1997) we
+ would only backport changes that affect clock_gettime() code base and
+ execution path. This is per SRU guidelines, trying to minimize amount
+ of changes to be reviewed and merged.
+
+Author: Rafael David Tinoco <[e-mail]>
+Origin: backport, https://github.com/ClusterLabs/pacemaker/commit/077229220
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1881762
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+Last-Update: 2020-10-07
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ daemons/execd/execd_commands.c | 67 ++++++++++++++++++++++------------
+ 1 file changed, 44 insertions(+), 23 deletions(-)
+
+diff --git a/daemons/execd/execd_commands.c b/daemons/execd/execd_commands.c
+index 9ded90c33..facdea629 100644
+--- a/daemons/execd/execd_commands.c
++++ b/daemons/execd/execd_commands.c
+@@ -229,6 +229,10 @@ free_lrmd_cmd(lrmd_cmd_t * cmd)
+     free(cmd);
+ }
+ 
++#ifdef PCMK__TIME_USE_CGT
++static inline bool time_is_set(struct timespec *);
++#endif
++
+ static gboolean
+ stonith_recurring_op_helper(gpointer data)
+ {
+@@ -250,7 +254,7 @@ stonith_recurring_op_helper(gpointer data)
+     rsc->pending_ops = g_list_append(rsc->pending_ops, cmd);
+ #ifdef PCMK__TIME_USE_CGT
+     clock_gettime(CLOCK_MONOTONIC, &cmd->t_queue);
+-    if (cmd->t_first_queue.tv_sec == 0) {
++    if (!time_is_set(&(cmd->t_first_queue))) {
+         cmd->t_first_queue = cmd->t_queue;
+     }
+ #elif defined(HAVE_SYS_TIMEB_H)
+@@ -382,7 +386,7 @@ schedule_lrmd_cmd(lrmd_rsc_t * rsc, lrmd_cmd_t * cmd)
+     rsc->pending_ops = g_list_append(rsc->pending_ops, cmd);
+ #ifdef PCMK__TIME_USE_CGT
+     clock_gettime(CLOCK_MONOTONIC, &cmd->t_queue);
+-    if (cmd->t_first_queue.tv_sec == 0) {
++    if (!time_is_set(&(cmd->t_first_queue))) {
+         cmd->t_first_queue = cmd->t_queue;
+     }
+ #elif defined(HAVE_SYS_TIMEB_H)
+@@ -449,7 +453,42 @@ send_client_notify(gpointer key, gpointer value, gpointer user_data)
+                client->name, client->id, msg, rc);
+ }
+ 
+-#if defined(PCMK__TIME_USE_CGT) || defined(HAVE_SYS_TIMEB_H)
++#ifdef PCMK__TIME_USE_CGT /* clock_gettime() fixes only (LP: #1881762) */
++
++static inline bool
++time_is_set(struct timespec *timespec)
++{
++    return (timespec != NULL) &&
++           ((timespec->tv_sec != 0) || (timespec->tv_nsec != 0));
++}
++
++static int
++time_diff_ms(struct timespec *now, struct timespec *old)
++{
++    int diff_ms = 0;
++
++    if (time_is_set(old)) {
++        struct timespec local_now = { 0, };
++
++        if (now == NULL) {
++            clock_gettime(CLOCK_MONOTONIC, &local_now);
++            now = &local_now;
++        }
++        diff_ms = (now->tv_sec - old->tv_sec) * 1000
++                  + (now->tv_nsec - old->tv_nsec) / 1000000;
++    }
++    return diff_ms;
++}
++
++static void
++cmd_original_times(lrmd_cmd_t * cmd)
++{
++    cmd->t_run = cmd->t_first_run;
++    cmd->t_queue = cmd->t_first_queue;
++}
++
++#elif defined(HAVE_SYS_TIMEB_H) /* ftime support kept (LP: #1881762) */
++
+ /*!
+  * \internal
+  * \brief Return difference between two times in milliseconds
+@@ -463,38 +502,19 @@ send_client_notify(gpointer key, gpointer value, gpointer user_data)
+  *       24 days or more.
+  */
+ static int
+-#ifdef PCMK__TIME_USE_CGT
+-time_diff_ms(struct timespec *now, struct timespec *old)
+-{
+-    struct timespec local_now = { 0, };
+-#else
+ time_diff_ms(struct timeb *now, struct timeb *old)
+ {
+     struct timeb local_now = { 0, };
+-#endif
+ 
+     if (now == NULL) {
+-#ifdef PCMK__TIME_USE_CGT
+-        clock_gettime(CLOCK_MONOTONIC, &local_now);
+-#else
+         ftime(&local_now);
+-#endif
+         now = &local_now;
+     }
+     if ((old == NULL)
+-#ifdef PCMK__TIME_USE_CGT
+-            || (old->tv_sec == 0)) {
+-#else
+             || (old->time == 0)) {
+-#endif
+         return 0;
+     }
+-#ifdef PCMK__TIME_USE_CGT
+-    return (now->tv_sec - old->tv_sec) * 1000
+-            + (now->tv_nsec - old->tv_nsec) / 1000;
+-#else
+     return (now->time - old->time) * 1000 + now->millitm - old->millitm;
+-#endif
+ }
+ 
+ /*!
+@@ -523,6 +543,7 @@ cmd_original_times(lrmd_cmd_t * cmd)
+     cmd->t_run = cmd->t_first_run;
+     cmd->t_queue = cmd->t_first_queue;
+ }
++
+ #endif
+ 
+ static void
+@@ -1419,7 +1440,7 @@ lrmd_rsc_execute(lrmd_rsc_t * rsc)
+         g_list_free_1(first);
+ 
+ #ifdef PCMK__TIME_USE_CGT
+-        if (cmd->t_first_run.tv_sec == 0) {
++        if (!time_is_set(&(cmd->t_first_run))) {
+             clock_gettime(CLOCK_MONOTONIC, &cmd->t_first_run);
+         }
+         clock_gettime(CLOCK_MONOTONIC, &cmd->t_run);
+-- 
+2.25.1
+
diff --git a/debian/patches/ubuntu-2.0.3-fixes/lp1881762-02-Low-executor-record-correct-last-run-and-last-rc.patch b/debian/patches/ubuntu-2.0.3-fixes/lp1881762-02-Low-executor-record-correct-last-run-and-last-rc.patch
new file mode 100644
index 0000000..d24bbfa
--- /dev/null
+++ b/debian/patches/ubuntu-2.0.3-fixes/lp1881762-02-Low-executor-record-correct-last-run-and-last-rc.patch
@@ -0,0 +1,133 @@
+Description: Low: executor: record correct last run and last rc change times
+
+ This is a regression introduced by 4b8b84cc, which replaced ftime()
+ calls with calls to clock_gettime(CLOCK_MONOTONIC, ...).
+
+ However the last run and last rc change times were passed back to the
+ client as epoch timestamps, which would end up in the CIB resource
+ operation history (and crm_mon output).
+
+ The last rc change time was never used to calculate an interval, which
+ means it never really needed to use ftime() to begin with -- a time_t
+ set to time(NULL) would have been sufficient, which is what is now used.
+
+ For the last run, which is also used to calculate an interval (queue
+ time and execution time), we now store both the monotonic timestamp (for
+ interval calculation) and an equivalent epoch time_t (for return to the
+ client).
+
+ [Backport]
+
+ After SRU review it was decided that, instead of cherry-picking the 2
+ upstream merges pointed by upstream maintainer (#1992 and #1997) we
+ would only backport changes that affect clock_gettime() code base and
+ execution path. This is per SRU guidelines, trying to minimize amount
+ of changes to be reviewed and merged.
+
+Author: Ken Gaillot <[e-mail]>
+Origin: backport, https://github.com/ClusterLabs/pacemaker/commit/9075ad9
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1881762
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+Last-Update: 2020-10-08
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ daemons/execd/execd_commands.c | 50 +++++++++++++++++++++++++---------
+ 1 file changed, 37 insertions(+), 13 deletions(-)
+
+diff --git a/daemons/execd/execd_commands.c b/daemons/execd/execd_commands.c
+index facdea629..e14be0276 100644
+--- a/daemons/execd/execd_commands.c
++++ b/daemons/execd/execd_commands.c
+@@ -70,13 +70,33 @@ typedef struct lrmd_cmd_s {
+      * command per operation, so they need info about the original and the most
+      * recent.
+      */
+-#ifdef PCMK__TIME_USE_CGT
+-    struct timespec t_first_run;   /* Timestamp of when op first ran */
+-    struct timespec t_run;         /* Timestamp of when op most recently ran */
+-    struct timespec t_first_queue; /* Timestamp of when op first was queued */
+-    struct timespec t_queue;       /* Timestamp of when op most recently was queued */
+-    struct timespec t_rcchange;    /* Timestamp of last rc change */
+-#elif defined(HAVE_SYS_TIMEB_H)
++#ifdef PCMK__TIME_USE_CGT /* clock_gettime() fixes only (LP: #1881762) */
++
++    /* We can track operation queue time and run time, to be saved with the CIB
++     * resource history (and displayed in cluster status). We need
++     * high-resolution monotonic time for this purpose, so we use
++     * clock_gettime(CLOCK_MONOTONIC, ...) (if available, otherwise this feature
++     * is disabled).
++     *
++     * However, we also need epoch timestamps for recording the time the command
++     * last ran and the time its return value last changed, for use in time
++     * displays (as opposed to interval calculations). We keep time_t values for
++     * this purpose.
++     *
++     * The last run time is used for both purposes, so we keep redundant
++     * monotonic and epoch values for this. Technically the two could represent
++     * different times, but since time_t has only second resolution and the
++     * values are used for distinct purposes, that is not significant.
++     */
++
++    struct timespec t_first_run;    // When op first ran
++    struct timespec t_run;          // When op most recently ran
++    struct timespec t_first_queue;  // When op was first queued
++    struct timespec t_queue;        // When op was most recently queued
++    time_t epoch_last_run;          // Epoch timestamp of when op last ran
++    time_t epoch_rcchange;          // Epoch timestamp of when rc last changed
++
++#elif defined(HAVE_SYS_TIMEB_H) /* ftime support kept (LP: #1881762) */
+     struct timeb t_first_run;   /* Timestamp of when op first ran */
+     struct timeb t_run;         /* Timestamp of when op most recently ran */
+     struct timeb t_first_queue; /* Timestamp of when op first was queued */
+@@ -589,10 +609,10 @@ send_cmd_complete_notify(lrmd_cmd_t * cmd)
+     crm_xml_add_int(notify, F_LRMD_RSC_DELETED, cmd->rsc_deleted);
+ 
+ #if defined(PCMK__TIME_USE_CGT) || defined(HAVE_SYS_TIMEB_H)
+-#ifdef PCMK__TIME_USE_CGT
+-    crm_xml_add_ll(notify, F_LRMD_RSC_RUN_TIME, (long long) cmd->t_run.tv_sec);
+-    crm_xml_add_ll(notify, F_LRMD_RSC_RCCHANGE_TIME, (long long) cmd->t_rcchange.tv_sec);
+-#else
++#ifdef PCMK__TIME_USE_CGT /* clock_gettime() fixes only (LP: #1881762) */
++    crm_xml_add_ll(notify, F_LRMD_RSC_RUN_TIME, (long long) cmd->epoch_last_run);
++    crm_xml_add_ll(notify, F_LRMD_RSC_RCCHANGE_TIME, (long long) cmd->epoch_rcchange);
++#else /* ftime support kept (LP: #1881762) */
+     crm_xml_add_ll(notify, F_LRMD_RSC_RUN_TIME, (long long) cmd->t_run.time);
+     crm_xml_add_ll(notify, F_LRMD_RSC_RCCHANGE_TIME, (long long) cmd->t_rcchange.time);
+ #endif
+@@ -669,6 +689,9 @@ cmd_reset(lrmd_cmd_t * cmd)
+ #if defined(PCMK__TIME_USE_CGT) || defined(HAVE_SYS_TIMEB_H)
+     memset(&cmd->t_run, 0, sizeof(cmd->t_run));
+     memset(&cmd->t_queue, 0, sizeof(cmd->t_queue));
++#endif
++#if defined(PCMK__TIME_USE_CGT) /* clock_gettime() fixes only (LP: #1881762) */
++    cmd->epoch_last_run = 0;
+ #endif
+     free(cmd->exit_reason);
+     cmd->exit_reason = NULL;
+@@ -910,7 +933,7 @@ action_complete(svc_action_t * action)
+ 
+ #ifdef PCMK__TIME_USE_CGT
+     if (cmd->exec_rc != action->rc) {
+-        clock_gettime(CLOCK_MONOTONIC, &cmd->t_rcchange);
++        cmd->epoch_rcchange = time(NULL);
+     }
+ #elif defined(HAVE_SYS_TIMEB_H)
+     if (cmd->exec_rc != action->rc) {
+@@ -1439,11 +1462,12 @@ lrmd_rsc_execute(lrmd_rsc_t * rsc)
+         rsc->pending_ops = g_list_remove_link(rsc->pending_ops, first);
+         g_list_free_1(first);
+ 
+-#ifdef PCMK__TIME_USE_CGT
++#ifdef PCMK__TIME_USE_CGT /* clock_gettime() fixes only (LP: #1881762) */
+         if (!time_is_set(&(cmd->t_first_run))) {
+             clock_gettime(CLOCK_MONOTONIC, &cmd->t_first_run);
+         }
+         clock_gettime(CLOCK_MONOTONIC, &cmd->t_run);
++        cmd->epoch_last_run = time(NULL);
+ #elif defined(HAVE_SYS_TIMEB_H)
+         if (cmd->t_first_run.time == 0) {
+             ftime(&cmd->t_first_run);
+-- 
+2.25.1
+
diff --git a/debian/patches/ubuntu-2.0.3-fixes/lp1881762-03-Refactor-executor-functionize-getting-current.patch b/debian/patches/ubuntu-2.0.3-fixes/lp1881762-03-Refactor-executor-functionize-getting-current.patch
new file mode 100644
index 0000000..641acd3
--- /dev/null
+++ b/debian/patches/ubuntu-2.0.3-fixes/lp1881762-03-Refactor-executor-functionize-getting-current.patch
@@ -0,0 +1,88 @@
+Description: Refactor: executor: functionize getting current time in
+ timespec
+
+ ... to reduce code duplication.
+
+ Also, previously, when executing a resource command, the run and first
+ run times would be set with separate clock_gettime() calls, so they
+ would slightly different; this avoids that by copying the run time to
+ the first run time.
+
+Author: Ken Gaillot <[e-mail]>
+Origin: upstream, https://github.com/ClusterLabs/pacemaker/commit/71ae72d
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1881762
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+Last-Update: 2020-10-08
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ daemons/execd/execd_commands.c | 25 +++++++++++++------------
+ 1 file changed, 13 insertions(+), 12 deletions(-)
+
+diff --git a/daemons/execd/execd_commands.c b/daemons/execd/execd_commands.c
+index e14be0276..903f72a53 100644
+--- a/daemons/execd/execd_commands.c
++++ b/daemons/execd/execd_commands.c
+@@ -251,6 +251,7 @@ free_lrmd_cmd(lrmd_cmd_t * cmd)
+ 
+ #ifdef PCMK__TIME_USE_CGT
+ static inline bool time_is_set(struct timespec *);
++static void get_current_time(struct timespec *, struct timespec *);
+ #endif
+ 
+ static gboolean
+@@ -273,10 +274,7 @@ stonith_recurring_op_helper(gpointer data)
+     rsc->recurring_ops = g_list_remove(rsc->recurring_ops, cmd);
+     rsc->pending_ops = g_list_append(rsc->pending_ops, cmd);
+ #ifdef PCMK__TIME_USE_CGT
+-    clock_gettime(CLOCK_MONOTONIC, &cmd->t_queue);
+-    if (!time_is_set(&(cmd->t_first_queue))) {
+-        cmd->t_first_queue = cmd->t_queue;
+-    }
++    get_current_time(&(cmd->t_queue), &(cmd->t_first_queue));
+ #elif defined(HAVE_SYS_TIMEB_H)
+     ftime(&cmd->t_queue);
+     if (cmd->t_first_queue.time == 0) {
+@@ -405,10 +403,7 @@ schedule_lrmd_cmd(lrmd_rsc_t * rsc, lrmd_cmd_t * cmd)
+ 
+     rsc->pending_ops = g_list_append(rsc->pending_ops, cmd);
+ #ifdef PCMK__TIME_USE_CGT
+-    clock_gettime(CLOCK_MONOTONIC, &cmd->t_queue);
+-    if (!time_is_set(&(cmd->t_first_queue))) {
+-        cmd->t_first_queue = cmd->t_queue;
+-    }
++    get_current_time(&(cmd->t_queue), &(cmd->t_first_queue));
+ #elif defined(HAVE_SYS_TIMEB_H)
+     ftime(&cmd->t_queue);
+     if (cmd->t_first_queue.time == 0) {
+@@ -507,6 +502,15 @@ cmd_original_times(lrmd_cmd_t * cmd)
+     cmd->t_queue = cmd->t_first_queue;
+ }
+ 
++static void
++get_current_time(struct timespec *t_current, struct timespec *t_orig)
++{
++    clock_gettime(CLOCK_MONOTONIC, t_current);
++    if ((t_orig != NULL) && !time_is_set(t_orig)) {
++        *t_orig = *t_current;
++    }
++}
++
+ #elif defined(HAVE_SYS_TIMEB_H) /* ftime support kept (LP: #1881762) */
+ 
+ /*!
+@@ -1463,10 +1467,7 @@ lrmd_rsc_execute(lrmd_rsc_t * rsc)
+         g_list_free_1(first);
+ 
+ #ifdef PCMK__TIME_USE_CGT /* clock_gettime() fixes only (LP: #1881762) */
+-        if (!time_is_set(&(cmd->t_first_run))) {
+-            clock_gettime(CLOCK_MONOTONIC, &cmd->t_first_run);
+-        }
+-        clock_gettime(CLOCK_MONOTONIC, &cmd->t_run);
++        get_current_time(&(cmd->t_run), &(cmd->t_first_run));
+         cmd->epoch_last_run = time(NULL);
+ #elif defined(HAVE_SYS_TIMEB_H)
+         if (cmd->t_first_run.time == 0) {
+-- 
+2.25.1
+
diff --git a/debian/rules b/debian/rules
index b6d3b94..77d4952 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,8 +21,20 @@ ifeq ($(shell dpkg-vendor --query vendor)/$(DEB_HOST_ARCH), Ubuntu/i386)
 	-Npacemaker-resource-agents
 endif
 
-# ftime causes deprecation errors now, but the clock_gettime replacement is
-# disabled by default in 2.0.3. Enable it.
+# https://bugs.launchpad.net/bugs/1881762 (LP: #1881762)
+#
+# Sticking with ftime() causes deprecation errors. By mistake clock_gettime()
+# code was not finished and made default in version 2.0.3 (git log: b5ff0e4).
+# I could have removed ftime() support by picking upstream merges #1992 and
+# #1997 entirely, but for the purpose of a SRU it didn't feel right (after
+# discussions with SRU team).
+#
+# Commenting the line below will re-enable ftime() clock functions but,
+# unfortunately, it will break nagios and systemd resources support (as they
+# require clock_gettime). It will also cause compilation warning-as-errors
+# for deprecated ftime() function (which can be work around by
+# -Wno-error=deprecated-declarations if ever needed).
+#
 CPPFLAGS = -UPCMK_TIME_EMERGENCY_CGT
 
 %: