From fae7a01fa382bba441a4ccaa1f3f337eb4176e94 Mon Sep 17 00:00:00 2001 From: Suresh Venkata Date: Fri, 7 Apr 2017 15:18:46 -0700 Subject: [PATCH] Fixes:ISSU vrouter agent sometims in init state after ISSU migrate / rollback Description: stopping supervisor-vrouter is needed to remove vrouter module. But stopping supervisor-vrouter might take some time, which is causing a failure in rmmod of vrouter, as vrouter is still in use by contrail-vrouter-agent. With -w option, rmmod will wait till vrouter module is not in use before it is removed. Closes-Bug:1680653 Change-Id: If53da17cdca420cc70ed6ba7f9a8396397c3d735 --- src/config/utils/issu_process.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/utils/issu_process.sh b/src/config/utils/issu_process.sh index 54657617c6c..67236aae0ac 100755 --- a/src/config/utils/issu_process.sh +++ b/src/config/utils/issu_process.sh @@ -7,7 +7,7 @@ function issu_contrail_switch_compute_node { openstack-config --set /etc/contrail/supervisord_vrouter_files/contrail-vrouter-agent.ini program:contrail-vrouter-agent killasgroup true openstack-config --set /etc/contrail/contrail-vrouter-nodemgr.conf DISCOVERY server $1 for i in `ls /etc/contrail/contrail-tor-agent-*`; do echo $i; openstack-config --set $i DISCOVERY server $1; done - service supervisor-vrouter stop; rmmod vrouter;modprobe vrouter;service supervisor-vrouter start + service supervisor-vrouter status; service supervisor-vrouter stop; service supervisor-vrouter status; rmmod -w vrouter;modprobe vrouter;service supervisor-vrouter start contrail-status route -n }