Message ID | 201712071202.vB7C2oJr031545@finist_ce7.work |
---|---|
State | New |
Series | "ve: fix container stopped state check" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [64.233.165.109] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Thu, 07 Dec 2017 13:07:43 +0100 (CET) Received: by 10.236.179.132 with SMTP id e4csp935479pjr; Thu, 7 Dec 2017 04:07:40 -0800 (PST) X-Google-Smtp-Source: AGs4zMaJsvacCCKjphJzUe49zPteqxLwHA/Vkma+//lg7fA4KYSkdJbtwrjfVUmx/O8uHdqcb5mz X-Received: by 10.84.254.69 with SMTP id a5mr25210668pln.353.1512648460322; Thu, 07 Dec 2017 04:07:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512648460; cv=none; d=google.com; s=arc-20160816; b=RFKZ5691d4Ne+wY9COGjPtXinJ5MBnsdAMNDGANvnOvkTKQtopvK6G6sxvQLFEVZfY H0JfDCk/SpninTxr7q5uS0wbedZNDPlw97ubZu56G5+YIEzzSJr2HofWPxBf+7e4V6z4 BI6uQ1ZkYXiYX6sbNDcQaqg25QSL3BVMSrLAlMtdnB0p7JVOmV18CgejF64hNKkbU3W6 mVp+9R+bu/O4T8+5OCcoLcJyLiFinnWovQo3Q2CukpWWkyx+sHZJ06g3rc83qom+VZsT tBBML80UC2wD6p899P3z/poF4kaB0LrhR0ePX1gLU0zqcZqp3DZYG0YXttpWF8GT723J luYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:spamdiagnosticmetadata:spamdiagnosticoutput:mime-version :in-reply-to:to:from:message-id:date:arc-authentication-results; bh=h/HCl3EQlvkkGMyo81xFA7aAeEghVhnE/7SVgYy3wGI=; b=Gy0Bw24bv7vn9hDMjR4qDYNEDH3fswh1b7DbdGul/svSe3cUmUamxs9OoMKmqhtH3h 1aTHDAfoIvzzO3HkZYzxGiTmf65nFe1bbZDxbMQ2kno02bqK2wEUZCz3NSRIryKhVK/Y /kbXteCHiAPFxIi6y+dZ06kMRWvLbgOU8N0qCl5cbzeZmsn/9OeLLqy6CwVUNlee1Zbo 8qvyV0PIWV9uTHM+Tc4koMGIJE6XZQ5xyBfjvgMyaxigh5EJxcTFg2ZDIYevuJwTXj6f 74g5bmyURcfH0IsC2D4c/qhcIGw7NlWVK5F/n5OPyY0uzx2mD6Lu2Vkcz7lAXqI3TpBg Z45g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 195.214.232.140 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Return-Path: <devel-bounces@openvz.org> Received: from mail.openvz.org ([195.214.232.140]) by mx.google.com with ESMTPS id u70si3646639pgc.743.2017.12.07.04.07.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Dec 2017 04:07:40 -0800 (PST) Received-SPF: pass (google.com: domain of devel-bounces@openvz.org designates 195.214.232.140 as permitted sender) client-ip=195.214.232.140; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 195.214.232.140 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id vB7C39oH032285; Thu, 7 Dec 2017 15:03:10 +0300 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp0240.outbound.protection.outlook.com [213.199.154.240]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id vB7C375o032282 for <devel@openvz.org>; Thu, 7 Dec 2017 15:03:07 +0300 Received: from HE1PR08CA0051.eurprd08.prod.outlook.com (2603:10a6:7:2a::22) by HE1PR08MB2699.eurprd08.prod.outlook.com (2603:10a6:7:2b::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.282.5; Thu, 7 Dec 2017 12:02:52 +0000 Received: from VE1EUR01FT031.eop-EUR01.prod.protection.outlook.com (2a01:111:f400:7e01::207) by HE1PR08CA0051.outlook.office365.com (2603:10a6:7:2a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.302.9 via Frontend Transport; Thu, 7 Dec 2017 12:02:52 +0000 Authentication-Results: spf=pass (sender IP is 195.214.232.6) smtp.mailfrom=virtuozzo.com; openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=pass action=none header.from=virtuozzo.com; Received-SPF: Pass (protection.outlook.com: domain of virtuozzo.com designates 195.214.232.6 as permitted sender) receiver=protection.outlook.com; client-ip=195.214.232.6; helo=finist_ce7.work; Received: from finist_ce7.work (195.214.232.6) by VE1EUR01FT031.mail.protection.outlook.com (10.152.2.225) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.282.5 via Frontend Transport; Thu, 7 Dec 2017 12:02:51 +0000 Received: from finist_ce7.work (localhost [127.0.0.1]) by finist_ce7.work (8.14.7/8.14.7) with ESMTP id vB7C2ok8031546; Thu, 7 Dec 2017 15:02:50 +0300 Received: (from khorenko@localhost) by finist_ce7.work (8.14.7/8.14.7/Submit) id vB7C2oJr031545; Thu, 7 Dec 2017 15:02:50 +0300 Date: Thu, 7 Dec 2017 15:02:50 +0300 Message-ID: <201712071202.vB7C2oJr031545@finist_ce7.work> X-Authentication-Warning: finist_ce7.work: khorenko set sender to khorenko@virtuozzo.com using -f From: Konstantin Khorenko <khorenko@virtuozzo.com> To: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com> In-Reply-To: <20171201112242.8573.67779.stgit@localhost.localdomain> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:195.214.232.6; IPV:CAL; CTRY:RU; EFV:NLI; SFV:NSPM; SFS:(2980300002)(438002)(199004)(189003)(16586007)(42186006)(54906003)(1076002)(48376002)(86362001)(106002)(50466002)(33896004)(6636002)(51416003)(69596002)(5660300001)(4326008)(356003)(8936002)(55236003)(40036005)(81166006)(106466001)(21086003)(53936002)(81156014)(8276002)(2950100002)(8676002)(1096003)(107886003)(6862004)(36756003)(26826003)(9686003)(966005)(87636003)(6306002)(305945005)(47776003)(4477795004)(97736004)(4000290100002); DIR:INB; SFP:; SCL:1; SRVR:HE1PR08MB2699; H:finist_ce7.work; FPR:; SPF:Pass; PTR:ErrorRetry; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; VE1EUR01FT031; 1:iI+wvNYOyy0liGyKZnc7O+byUmQZMNBYsa0+uVNFsG0Hxj6su6+rDGjUCX78Jsdg3aijbvO9hBhsJlRku9/SXJgjpaB0tfDLuiywFMgBrJrmFzKz5j/vJ9t4Jx5WOvBn MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c49e921f-3984-4cb1-7a9a-08d53d6a70e5 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4608076)(4534020)(4602075)(7168020)(4627115)(201703031133081)(201702281549075)(2017052603286); SRVR:HE1PR08MB2699; X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB2699; 3:uaeu4O/EyisLuNYOk7GV6Y1kaM4YoevXif6p6KQKEiZmeskmjhpACyDld97FY/b9fzVCzP6e9XYadJNdYw0b3hHrcmsKcjQvCdtrysj4ajOGKhKzObfMOhaR1DyXIFpuz3v3RJUUmT1dSCvA4nz+M/t0Pt8Bukl4G2UFP7M6g6jiPHKaRsNGatRzO7DnZutQkVgV8c/tSmkZkj3VLwu/pK8ArOy1Ay2GnzU4VOYRR3uKcxbw3ovU32gPlV17tRQTDIWxWJZeax2rqshu8hVBASpljuCTSdDj2cy0awnXDTHHrDBmTYaPGATjqgR9y5f8/IlmIA55HX75mRbXSQ3PLuX+hCnGWmiRjX0L+G/H53A=; 25:+ghh8S1sPiebNj4sFjr3NykKgBdbD31qn/pBsT79sj/jRfgLeI74BAN3vtAoOECVY2UlFaSDFGAEkaMkqRqZ/rcgrxjOE+xAN5ldLA2UplUwRNqH2UL5StC/j87VYb09hyClSHLCk+nDStiFu+Ifq4DYZtOtuM6uV0RYh7ILlv3H1sEmIoUf9jEuHckCCr0oZHUzjH4emrAUIuzHTPpe4qdaYVkxkNjm66tvCyAd/15Bp4xG6TXqWJpT5E0QGrSDzZ3tWFOPQfY84EetrWy7QqhJa9tS+l0rC2QD8NtikNOZ04R5tgkvo2ytaSQ0Azyc00Rotd7GNf9ZwUlRAIy1EQ== X-MS-TrafficTypeDiagnostic: HE1PR08MB2699: X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB2699; 31:GlFMtRFb+8VylSrOyaFa7n4Ed2zC7u2oeiUp1S5QbViqQJZ+YS4uG/95fl7kBnZRcpsmQqDsq6QvV4wKACw0+DfUzVW5Vu9qo5QXqWaz3HoU9LXcY4BW41QZbFoP6CYX7bXh/jnDvUb0+tgZaaKtcwSjSEmciYxuA58gWp3wQbNj8/veaBotaCHgvBycchKx2Tu0C0JaIiRM9dzd4UCr86lc41xPQOuVWdn7Joa/KGM=; 20:eGKo3mAHW8uMLgy8rzusRZUADXdiiRqyMlYth9g6IoypC/5lJh12C3HrmN9pclxqzwW/pc/UE0Vnf0oclqehxKNjAl7Q7lJcVQWBNJP2od1Vm3OhU2yvd7xK5IJowoD4pk1bA3LWcsjW6PMAnxeVzKO5AqfnJNyolLovQXvP7YrWIbmerQrqAbOIgJsUhhlODyAgme8Skh/9v+7vxULYNKJP9L0v/Fw/DdTj5Qj6+U/f5nOPkD6edR2uVM+Ni0p5P+Eog6yQoFw2Ed7Cu/BiSAPaIsvKK1M+wcyJ2I3AKPau8byknkoI8lId6B/9Dc8cP2T7w6O4oY3fpUO9iEzppUN0L4mMjyzOxPxcc4l6qsXjySx3GUWb/0yfYAhmFeojtAtR+rOfSqVizNn/8EmKZv6AqspHiVixULuk1Ndj4yg= X-Exchange-Antispam-Report-Test: UriScan:(215187933766430); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101521199)(2401047)(8121501046)(10201501046)(3231022)(93006095)(93004095)(3002001)(201708071742011); SRVR:HE1PR08MB2699; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:HE1PR08MB2699; X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB2699; 4:/AAJvKrbTc6j8sfB80tymuO/q5Hoj1sByqZSHimAjgVMNOrtu9m311gsH3+IYu+yV2PT9PTQsew1cr5N3RblzU8bUwybMnmbXJdY0TJpEk8vKiPR/QaVIv8PZ93FSG/ruEm/h1osJW56Td61VxQgEQ3DeqGxdzzZ5R1xSI9hOgqT+4Ev4p+yapHMgjGZW9HuU7EjB5Ixu7MUqpL/MYcGcPdv02JBFXYapk7Hz0KCOXG9MQlyJaHCftyIEJMefx/GHvXYq4wdi5PSz9R4RQpfMti3rlYFAbIKmGFVhMwVal9fCDjK6WQb1+TFfWViid8l X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR08MB2699; 23:naIOOjS65wvsjApA0Y0TtKnJI/+JRBgKvLwX02xvO?= =?us-ascii?Q?gEKRpCkN59aJl4pO7KbVeHzDtWzwd8fvFsUo90njE/cSRQOwaS5byLdaDg+4?= =?us-ascii?Q?giM1p+XYpLurGCtifym0oR4AU1gJJPdhLHnfHeSbk2ILa2hwGEUkLZf3nFih?= =?us-ascii?Q?rnpgp5qP4P+bfi2LA+dflecAc+9F7FLQkihGIMzqIevwOP0cldLCmeTCko0P?= =?us-ascii?Q?RIQeob3XQ2J5Tuo/CgbcYbEeutXRMB4MHF9iA9xqHicnxEoJY3+j5TBnmgKG?= =?us-ascii?Q?y8BOj3jKi9oz2lhaemfKyNx2TEt1iLPY2M3r2R2HbaE4LtLrqr7ftewGAtIT?= =?us-ascii?Q?q7azYAoeCyiJ5So0Qfg60BQGvl/7YDvl5HF5gVkOX07gT4Z3QioPPDSFxIAr?= =?us-ascii?Q?pkOIv0/365bvjM1QC6yoOXd1o4mkAGxPRAJvGkZgn9cHh6vRlHoxkmUdtTHc?= =?us-ascii?Q?gOg1dZo/YKEA5agkYMCmKxbt9S7W3ZgbNQxp4766d3UVZnhlmyIKNbj1Jnhi?= =?us-ascii?Q?EJ3Vr/s3p1udKStrxmUf/Qk4drJrN3b9GjXHCidB5KGkCKfUTTznDk1+fNpH?= =?us-ascii?Q?3LYPNST1mCHJnP8rDyrzNIcQto8GxUuMDWZkft9CrkFYGWKh+99z2d/B3A7w?= =?us-ascii?Q?RFvZuYBVlscf6NWKjlKSGmD70qR5c/n1r4nk4xLsQ2MT44A0YD1jAfiIpTJF?= =?us-ascii?Q?pgjEmXHmsb1+Elc+HXmCBtlhqUnbRWHRD9vUNe/N5rusi9n9PVxBtX0rZSMm?= =?us-ascii?Q?HcajHFGvQH9G4Qi+Pjh9LpmetNHixEYInv099E/rNM2qKdZzj1ifwdRCp0hh?= =?us-ascii?Q?lSzXv2d1gnuIXNmqjXsHu8xcgT+JTB88T0fwn/i/78SF+BDASLt7DIUaeGZi?= =?us-ascii?Q?YX/4hxILFp5uzJn5WekArPizskUEXUSdkqZaZ4UEbQt/2i0x0ht+ewO0JtW5?= =?us-ascii?Q?jydFE+R2Pfst1J1rByv0K6g9P6QmycqsBhagQFso2Lm42QmbYvtjDsftSaQM?= =?us-ascii?Q?4eF61XoglD+caH5UTo3hwZ5hsqHpv5ITnH0WA3b6YZaQbSRmqUXCbjg/Z7VM?= =?us-ascii?Q?lS+Ie8=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB2699; 6:H9E0GlZM+rzrHAszxnW+G6xGNxUUnYEK32vMRaBr/pFAKv4gsv9aqpof5JBGT4YXv7LzxCOFm/8vg4gSDsP2rkWIEycNdYrCglg7nZ3VeSgI3UN2Z2CaTaZednW/CSzUYcFg1GKBHMfsTCRosvQALZ+PQQ80tfW48r9LQJd5DS9BVopaS4JI+29T9uwv42QuDVUm4ntlCLmdAy8+y1RulSsdBQ3gP4NZcwzsIpV8vIa45+U9bhuF4+5sukPNFxwigtzxZsrDdd8qkDckfkvggEDc+KdL2Eij3Ae1Uay0x+7uqrx0kn/UfpSHTbcreuJWBblBHwTOSTC0FnmQw0DPQxbV/ok3E6P8jm6AqzbVjn8=; 5:6riL+2ToTHCJSZjtP08HDJSJPoT7wGDOiK6nWnhskvllGnjqEAniff48/zjPxdM1SaHqdOkLgXqv7KBxdazvadsoqdsYrDt2GbIHvVldLQM2vcnu8jsFs7nb89MpwpqqTwlzhy/3AmxVl65IIsxBkmSyEq9ciAfbYycIx+wx6g4=; 24:rep/W0g7pFgYhWZo6imuLdO2OvyYPzWADYFUlAle8MI/7c5izO/KCJAy4mMGqnOKPQt8htZHELZEj04aT3iUeqSQdvbSZUxBULwZoveXM60=; 7:JdHFTvg+8iwnFumIrb+GzE/Mw/y43xgIWtJxN/3QzGYmtWtV6TjW6L4GAXqCvf4huXs9y5BEzPTqJARvNRD6ByrVsHPiHzQttqGKjWYbqgrKGtEb6dADjIMn80OXI1u+ph1aijJjayGs4WigjFwre4HHVdkG49AvCkQifQY4+7Y9pnXpI24tGlb69hWWHxXWfBZqzZ6VFYoOnM+FnzZM+bS0l4axySmCmfzudRwZG81wE5pxk2wRR+Ed46EJgm12 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB2699; 20:JP6ANVd6r92ffyO/IMhIaO9tioVGogxSlA8ovQGhIFLS1/qao7NgJgkk3Ve4NYLPjUJLmtsU+ekS2JnqaCaALexnpUXvcfb1cAFrwCHfo5AUBQJMcmyLkQO2bjGj2ig3cKbHv3KcXYJ275LBFjMR0a+3+a2Ca5u7DkeFC8wWXCs= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2017 12:02:51.0208 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c49e921f-3984-4cb1-7a9a-08d53d6a70e5 X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0bc7f26d-0264-416e-a6fc-8352af79c58f; Ip=[195.214.232.6]; Helo=[finist_ce7.work] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR08MB2699 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.214.232.6 X-MS-Exchange-CrossPremises-AuthSource: VE1EUR01FT031.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Anonymous X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-TransportTrafficSubType: X-MS-Exchange-CrossPremises-SCL: 1 X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Originating; SFV:NSPM; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: HE1PR08MB2699.eurprd08.prod.outlook.com Cc: OpenVZ devel <devel@openvz.org> Subject: [Devel] [PATCH RHEL7 COMMIT] ve: fix container stopped state check X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development <devel.openvz.org> List-Unsubscribe: <https://lists.openvz.org/mailman/options/devel>, <mailto:devel-request@openvz.org?subject=unsubscribe> List-Archive: <http://lists.openvz.org/pipermail/devel/> List-Post: <mailto:devel@openvz.org> List-Help: <mailto:devel-request@openvz.org?subject=help> List-Subscribe: <https://lists.openvz.org/mailman/listinfo/devel>, <mailto:devel-request@openvz.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org |
diff --git a/kernel/ve/ve.c b/kernel/ve/ve.c index b0188c3f71f9..c62851638c69 100644 --- a/kernel/ve/ve.c +++ b/kernel/ve/ve.c @@ -846,7 +846,7 @@ static int ve_state_read(struct cgroup *cg, struct cftype *cft, if (ve->is_running) seq_puts(m, "RUNNING"); - else if (!nr_threads_ve(ve)) + else if (!ve->init_task) seq_puts(m, "STOPPED"); else if (ve->ve_ns) seq_puts(m, "STOPPING");
The commit is pushed to "branch-rh7-3.10.0-693.11.1.vz7.39.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git after rh7-3.10.0-693.11.1.vz7.39.1 ------> commit d148fd97e03af83d7247812550333b78181c4479 Author: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com> Date: Thu Dec 7 15:02:50 2017 +0300 ve: fix container stopped state check Checking for empty cgroup is not correct, because init process leaves cgroup early in do_exit. This leads to a situation, when container is treated as stopped but its resources (VEIP for instance) are not yet released. Which in turn leads to container restart failure due to non-releases VEIP address. https://jira.sw.ru/browse/PSBM-78078 Signed-off-by: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com> --- kernel/ve/ve.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)