With this patch, users can query a running ovs-xapi-sync's version
or ask it to exit using ovs-appctl.
Signed-off-by: Ethan Jackson <ethan@nicira.com>
from ovs.db import types
import ovs.daemon
import ovs.db.idl
from ovs.db import types
import ovs.daemon
import ovs.db.idl
vlog = ovs.vlog.Vlog("ovs-xapi-sync")
session = None
force_run = False
vlog = ovs.vlog.Vlog("ovs-xapi-sync")
session = None
force_run = False
+exiting = False
+
+
+def unixctl_exit(conn, unused_argv, unused_aux):
+ global exiting
+ exiting = True
+ conn.reply(None)
# Set up a session to interact with XAPI.
# Set up a session to interact with XAPI.
+ ovs.unixctl.command_register("exit", "", 0, 0, unixctl_exit, None)
+ error, unixctl_server = ovs.unixctl.UnixctlServer.create(None)
+ if error:
+ ovs.util.ovs_fatal(error, "could not create unixctl server", vlog)
+
# This daemon is usually started before XAPI, but to complete our
# tasks, we need it. Wait here until it's up.
cookie_file = args.root_prefix + "/var/run/xapi_init_complete.cookie"
# This daemon is usually started before XAPI, but to complete our
# tasks, we need it. Wait here until it's up.
cookie_file = args.root_prefix + "/var/run/xapi_init_complete.cookie"
vm_ids = {} # Map from xs-vm-uuid to vm-id
seqno = idl.change_seqno # Sequence number when we last processed the db
while True:
vm_ids = {} # Map from xs-vm-uuid to vm-id
seqno = idl.change_seqno # Sequence number when we last processed the db
while True:
+ unixctl_server.run()
+ if exiting:
+ break;
+
idl.run()
if not force_run and seqno == idl.change_seqno:
poller = ovs.poller.Poller()
idl.run()
if not force_run and seqno == idl.change_seqno:
poller = ovs.poller.Poller()
+ unixctl_server.wait(poller)
idl.wait(poller)
poller.block()
continue
idl.wait(poller)
poller.block()
continue
+ unixctl_server.close()
+ idl.close()
+
if __name__ == '__main__':
try:
if __name__ == '__main__':
try: