From patchwork Fri Feb 17 11:26:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin Serdean X-Patchwork-Id: 729155 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vPrMF1RhCz9s8B for ; Fri, 17 Feb 2017 22:26:33 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 0018AB4A; Fri, 17 Feb 2017 11:26:30 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 57122B4A for ; Fri, 17 Feb 2017 11:26:29 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.cloudbasesolutions.com (mail.cloudbasesolutions.com [91.232.152.5]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id 69BCAE4 for ; Fri, 17 Feb 2017 11:26:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.cloudbasesolutions.com (Postfix) with ESMTP id 91C4D41CEC for ; Fri, 17 Feb 2017 13:26:27 +0200 (EET) X-Virus-Scanned: amavisd-new at cloudbasesolutions.com Received: from mail.cloudbasesolutions.com ([127.0.0.1]) by localhost (mail.cloudbasesolutions.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gEPfz9wR47DQ for ; Fri, 17 Feb 2017 13:26:27 +0200 (EET) Received: from mail.cloudbasesolutions.com (unknown [10.77.78.3]) by mail.cloudbasesolutions.com (Postfix) with ESMTP id 3945041CBF for ; Fri, 17 Feb 2017 13:26:27 +0200 (EET) Received: from CBSEX1.cloudbase.local ([10.77.78.3]) by CBSEX1.cloudbase.local ([10.77.78.3]) with mapi id 14.03.0319.002; Fri, 17 Feb 2017 12:26:26 +0100 From: Alin Serdean To: "dev@openvswitch.org" Thread-Topic: [PATCH] msi: add ovs-vswitchd trigger info This patch changes the service ovs-vswitchd from "auto" execution to "demand" start. Thread-Index: AQHSiRCsl5RKRFQ1C0aOo49x/FSkOg== Date: Fri, 17 Feb 2017 11:26:26 +0000 Message-ID: <20170217112617.11052-1-aserdean@cloudbasesolutions.com> Accept-Language: en-US, it-IT Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.77.78.1] MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] msi: add ovs-vswitchd trigger info This patch changes the service ovs-vswitchd from "auto" execution to "demand" start. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org This patch also introduces a custom action for the ovs-vswitchd service in which the following command will be executed before the service startup: sc triggerinfo ovs-vswitchd \ start/strcustom/6066F867-7CA1-4418-85FD-36E3F9C0600C/VmmsWmiEventProvider The above command is a service trigger available since Windows 7. More on the topic: https://msdn.microsoft.com/en-us/library/windows/desktop/dd405513%28v=vs.85%29.aspx In out case we will wait until Microsoft-Windows-Hyper-V-VMMS has triggered that the WMI provider: VmmsWmiEventProvider has started. The change is needed because the network service inside VMMS starts slower than ovs-vswitchd, which will cause a race condition because we check if the OVS extension is enabled on a single switch. Signed-off-by: Alin Gabriel Serdean --- Intended for branch-2.7, master. --- windows/ovs-windows-installer/CustomActions.wxs | 6 ++++++ windows/ovs-windows-installer/Product.wxs | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/windows/ovs-windows-installer/CustomActions.wxs b/windows/ovs-windows-installer/CustomActions.wxs index bce9455..422f951 100644 --- a/windows/ovs-windows-installer/CustomActions.wxs +++ b/windows/ovs-windows-installer/CustomActions.wxs @@ -63,5 +63,11 @@ + + diff --git a/windows/ovs-windows-installer/Product.wxs b/windows/ovs-windows-installer/Product.wxs index 0cdc9a8..23bc880 100644 --- a/windows/ovs-windows-installer/Product.wxs +++ b/windows/ovs-windows-installer/Product.wxs @@ -83,6 +83,8 @@ "ALL" AND (&OpenvSwitchDriver = 3)]]> "ALL" AND (&OpenvSwitchDriver = 3)]]> + + "ALL" AND (&OpenvSwitchDriver = 3)]]> "ALL" AND (&OpenvSwitchDriver = 3)]]> @@ -207,7 +209,7 @@ Name="ovs-vswitchd" DisplayName="Open vSwitch Service" Description="Open vSwitch Service" - Start="auto" + Start="demand" Account="LocalSystem" ErrorControl="ignore" Interactive="no">