[ovs-git] [openvswitch/ovs] dae4b7: ovsdb-cluster.at: Fix infinite loop in torture tests.

Dumitru Ceara noreply at github.com
Fri Dec 4 20:13:06 UTC 2020


  Branch: refs/heads/branch-2.14
  Home:   https://github.com/openvswitch/ovs
  Commit: dae4b77c035e057d6c7018bfbba81c0c59a2b11c
      https://github.com/openvswitch/ovs/commit/dae4b77c035e057d6c7018bfbba81c0c59a2b11c
  Author: Ilya Maximets <i.maximets at ovn.org>
  Date:   2020-12-04 (Fri, 04 Dec 2020)

  Changed paths:
    M tests/ovsdb-cluster.at

  Log Message:
  -----------
  ovsdb-cluster.at: Fix infinite loop in torture tests.

For some reason, while running cluster torture tests in GitHub Actions
workflow, failure of 'echo' command doesn't fail the loop and subshell
never exits, but keeps infinitely printing errors after breaking from
the loop on the right side of the pipeline:

  testsuite: line 8591: echo: write error: Broken pipe

Presumably, that is caused by some shell configuration option, but
I have no idea which one and I'm not able to reproduce locally with
shell configuration options provided in GitHub documentation.
Let's just add an explicit 'exit' on 'echo' failure.  This will
guarantee exit from the loop and the subshell regardless of
configuration.

Fixes: 0f03ae3754ec ("ovsdb: Improve timing in cluster torture test.")
Acked-by: Simon Horman <simon.horman at netronome.com>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>


  Commit: 602c4e8fa34dd6badb601a72ed0ae8c6d649d58a
      https://github.com/openvswitch/ovs/commit/602c4e8fa34dd6badb601a72ed0ae8c6d649d58a
  Author: Dumitru Ceara <dceara at redhat.com>
  Date:   2020-12-04 (Fri, 04 Dec 2020)

  Changed paths:
    M lib/ovsdb-idl.c

  Log Message:
  -----------
  ovsdb-idl: Fix expected condition seqno when changes are pending.

Commit 17f22fe46142 tried to address this but only covered some of the
cases.

The correct way to report the expected seqno is to take into account if
there already is a condition change that was requested to the server but
not acked yet.  In that case, the new condition change request will be
sent only after the already requested one is acked.  That is, expected
condition seqno when conditions are up to date is db->cond_seqno + 2 in
this case.

Fixes: 17f22fe46142 ("ovsdb-idl: Return correct seqno from ovsdb_idl_db_set_condition().")
Suggested-by: Ilya Maximets <i.maximets at ovn.org>
Signed-off-by: Dumitru Ceara <dceara at redhat.com>
Signed-off-by: Ilya Maximets <i.maximets at ovn.org>


Compare: https://github.com/openvswitch/ovs/compare/eff6b57bf211...602c4e8fa34d


More information about the git mailing list