]> git.proxmox.com Git - mirror_ovs.git/commitdiff
ovsdb-idl.at: Queue for termination all OVSDB IDL pids.
authorAlin Gabriel Serdean <aserdean@ovn.org>
Wed, 23 Sep 2020 11:22:47 +0000 (14:22 +0300)
committerIlya Maximets <i.maximets@ovn.org>
Thu, 8 Oct 2020 14:37:20 +0000 (16:37 +0200)
When running OVSDB cluster tests on Windows not all the ovsdb processes
are terminated.  Queue up the pids of the started processes for
termination when the test stops.

Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
tests/ovsdb-idl.at

index 261f4f323274c0464d9d4e201d255bb895e64401..b462585919a01de6d4a0139cfb3749e262f80104 100644 (file)
@@ -43,13 +43,13 @@ m4_define([OVSDB_CLUSTER_START_IDLTEST],
      AT_CHECK([ovsdb-tool join-cluster s$i.db \
                           $schema_name unix:s$i.raft unix:s1.raft])
    done
+   on_exit 'kill $(cat s*.pid)'
    for i in $(seq $n); do
      AT_CHECK([ovsdb-server -vraft -vconsole:warn --detach --no-chdir \
                    --log-file=s$i.log --pidfile=s$i.pid --unixctl=s$i \
                    --remote=punix:s$i.ovsdb                           \
                    m4_if([$2], [], [], [--remote=$2]) s$i.db])
    done
-   on_exit 'kill $(cat s*.pid)'
 
    for i in $(seq $n); do
        OVS_WAIT_UNTIL([ovs-appctl -t $(pwd)/s$i cluster/status ${schema_name} \