diff options
Diffstat (limited to 'src/ovs')
| -rwxr-xr-x | src/ovs/Makefile | 26 | ||||
| -rw-r--r-- | src/ovs/daemon.py | 32 |
2 files changed, 42 insertions, 16 deletions
diff --git a/src/ovs/Makefile b/src/ovs/Makefile index 68ac0f6d..223d2dcb 100755 --- a/src/ovs/Makefile +++ b/src/ovs/Makefile @@ -22,11 +22,26 @@ include ../mk/master.mk include ../package-list.mk +WORK_DIR = ovs +TAG_DONE_FLAG = $(WORK_DIR)/.$(OVS_TAG).done +CONFIG_CMD = +CONFIG_CMD += ./configure + +# If WITH_LINUX is defined, OVS is built without DPDK but with kernel +# module +# By default, OVS is built with DPDK + +# WITH_LINUX is the Linux kernel build directory used for building +# OVS kernel module as documented in OVS --with-linux switch +ifneq ($(WITH_LINUX),) # Building with Linux kernel +CONFIG_CMD += --with-linux=$(WITH_LINUX) + +else # Building with DPDK + # DPDK_DIR is the top directory for dpdk source tree # it can be passed in from Makefile command # if it is not set, try to read it in from environment # if it is still not set, then set it using relative path - DPDK_DIR ?= $(shell echo $$DPDK_DIR) ifeq ($(DPDK_DIR),) DPDK_DIR = ../../dpdk/dpdk @@ -35,20 +50,15 @@ endif ifeq ($(DPDK_TARGET),) DPDK_TARGET = x86_64-native-linuxapp-gcc endif +CONFIG_CMD += --with-dpdk=$(DPDK_DIR)/$(DPDK_TARGET) +endif # Kernel vs. DPDK .PHONY: install force_install config force_make # install depends on make force_install: force_make -WORK_DIR = ovs -TAG_DONE_FLAG = $(WORK_DIR)/.$(OVS_TAG).done -CONFIG_CMD = -CONFIG_CMD += ./configure -CONFIG_CMD += --with-dpdk=$(DPDK_DIR)/$(DPDK_TARGET) - - all: force_make @echo "Finished making $(WORK_DIR) " diff --git a/src/ovs/daemon.py b/src/ovs/daemon.py index 323644c6..db096353 100644 --- a/src/ovs/daemon.py +++ b/src/ovs/daemon.py @@ -44,12 +44,12 @@ class VSwitchd(tasks.Process): """ _ovsdb_pid = None _logfile = _LOG_FILE_VSWITCHD + _ovsdb_pidfile_path = os.path.join(settings.getValue('LOG_DIR'), + "ovsdb_pidfile.pid") - - _expect = r'EAL: Master l*core \d+ is ready' _proc_name = 'ovs-vswitchd' - def __init__(self, timeout=30, vswitchd_args=None): + def __init__(self, timeout=30, vswitchd_args=None, expected_cmd=None): """Initialise the wrapper with a specific start timeout and extra parameters. @@ -60,8 +60,8 @@ class VSwitchd(tasks.Process): """ self._logger = logging.getLogger(__name__) self._timeout = timeout + self._expect = expected_cmd; vswitchd_args = vswitchd_args or [] - self._cmd = ['sudo', '-E', _OVS_VSWITCHD_BIN] + vswitchd_args # startup/shutdown @@ -72,6 +72,7 @@ class VSwitchd(tasks.Process): :returns: None :raises: pexpect.EOF, pexpect.TIMEOUT """ + self._reset_ovsdb() self._start_ovsdb() # this has to be started first @@ -79,6 +80,7 @@ class VSwitchd(tasks.Process): super(VSwitchd, self).start() self.relinquish() except (pexpect.EOF, pexpect.TIMEOUT) as exc: + logging.error("Exception during VSwitch start.") self._kill_ovsdb() raise exc @@ -125,10 +127,11 @@ class VSwitchd(tasks.Process): self._logger, 'Creating ovsdb configuration database...') - self._ovsdb_pid = tasks.run_background_task( + tasks.run_background_task( ['sudo', _OVSDB_SERVER_BIN, '--remote=punix:%s' % os.path.join(_OVS_VAR_DIR, 'db.sock'), - '--remote=db:Open_vSwitch,Open_vSwitch,manager_options'], + '--remote=db:Open_vSwitch,Open_vSwitch,manager_options', + '--pidfile=' + self._ovsdb_pidfile_path , '--overwrite-pidfile'], self._logger, 'Starting ovsdb-server...') @@ -137,6 +140,19 @@ class VSwitchd(tasks.Process): :returns: None """ - if self._ovsdb_pid: - tasks.run_task(['sudo', 'kill', '-15', str(self._ovsdb_pid)], + with open (self._ovsdb_pidfile_path, "r") as pidfile: + ovsdb_pid = pidfile.read().strip() + + self._logger.info("Killing ovsdb with pid: " + ovsdb_pid) + + if ovsdb_pid: + tasks.run_task(['sudo', 'kill', '-15', str(ovsdb_pid)], self._logger, 'Killing ovsdb-server...') + + @staticmethod + def getDbSockPath(): + """Method returns location of db.sock file + + :returns: path to db.sock file. + """ + return os.path.join(_OVS_VAR_DIR, 'db.sock') |