Message ID | 1527757205-12889-2-git-send-email-adrian@lisas.de |
---|---|
State | Accepted |
Series | "Series without cover letter" |
Commit | 0b1e74cb77f9a9be580b1e5a6383177ba1f6e146 |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [173.194.222.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Thu, 31 May 2018 11:03:04 +0200 (CEST) Received: by 2002:a2e:5846:0:0:0:0:0 with SMTP id x6-v6csp314687ljd; Thu, 31 May 2018 02:02:58 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIY90rjPrJ3NyvVvs2aV4pFcq3pF1QBfMYgTCmBI/hpUGHZMGAcWhV3OwqWQdOEPQkj9Qmr X-Received: by 2002:a2e:944d:: with SMTP id o13-v6mr4768229ljh.65.1527757378923; Thu, 31 May 2018 02:02:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527757378; cv=none; d=google.com; s=arc-20160816; b=IqE1w6JRZpRSw4ztJ2U7pi+9nYUmvGPc338/thtcVeY6kBB0xW77Nqw6f7XyhuGzcV 0KzAUYmzX/GW7je/tx83KH/m4bgiiCRole3rJZZtyTSI8l76YQwZ27XluoX/AjmenzUv jfIkx3y5ctC/6j8S8EWWFJ7JmAwcNhHaIIAnbqZwGP7GDarAMOb6mHTi1W098NM3DDUr 2OQYHc1hdb48wdiG75/tBRZGlKicW0hUM6U6ZBGxZ58eaPEcUlMgjzxn3y5pDTJOgThV tgOgokQEHn7nyAuDPOgJVhj/fHCTn675cZ7myaGVBuhr+pFZNYReLZkArzmQatoHmkVE cloQ== 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 :references:in-reply-to:message-id:date:to:from :arc-authentication-results; bh=+KwsKb+6Sq2Vc+IcZwkIlLaY/zuRGrYNhQ5vDWTcJ1U=; b=kWt2yBkvh20l48lM0pzalBxbfyuCY4qKDFP7lQis1y9o2J8GM9Wf5PyZB40odD3W0M MukWwB3sWiyNExc75U5VNhW05sGeRiHrDTOEhSOZtI9kPlGydWLLmSy0je84+ykhCvYR lLw+WS8riAsnWt/DqKP/1ieUOZTlor7PLJ52pobu3iYCiOrPh6l21xPv9ozG8UF7OtrT Q/lUEcATtoqQZY2wgjho6y3+nl2arFuIo3V9e23B1Aj5CGuOQDF2WUv7bJYFcpi2istw omNJDqDIP2MVP3vVRaPNxMPKB2UuvjMXOx7EI4PW4ZCaFJARQw4ZixuakIS+9jQFOnuJ Qp2g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of criu-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=criu-bounces@openvz.org Return-Path: <criu-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [185.231.241.50]) by mx.google.com with ESMTPS id 63-v6si5572844ljj.186.2018.05.31.02.02.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 May 2018 02:02:58 -0700 (PDT) Received-SPF: pass (google.com: domain of criu-bounces@openvz.org designates 185.231.241.50 as permitted sender) client-ip=185.231.241.50; Authentication-Results: mx.google.com; spf=pass (google.com: domain of criu-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=criu-bounces@openvz.org Received: from localhost.localdomain (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id w4V90fQj002252; Thu, 31 May 2018 12:00:42 +0300 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02lp0054.outbound.protection.outlook.com [213.199.154.54]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id w4V90Gls002223 for <criu@openvz.org>; Thu, 31 May 2018 12:00:16 +0300 Received: from VI1PR08CA0092.eurprd08.prod.outlook.com (2603:10a6:800:d3::18) by AM4PR0801MB1603.eurprd08.prod.outlook.com (2603:10a6:200:3e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.11; Thu, 31 May 2018 09:00:18 +0000 Received: from HE1EUR01FT023.eop-EUR01.prod.protection.outlook.com (2a01:111:f400:7e1f::206) by VI1PR08CA0092.outlook.office365.com (2603:10a6:800:d3::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.820.11 via Frontend Transport; Thu, 31 May 2018 09:00:18 +0000 Authentication-Results: spf=none (sender IP is 66.187.233.73) smtp.mailfrom=lisas.de; openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=none action=none header.from=lisas.de; Received-SPF: None (protection.outlook.com: lisas.de does not designate permitted sender hosts) Received: from mx1.redhat.com (66.187.233.73) by HE1EUR01FT023.mail.protection.outlook.com (10.152.0.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.776.10 via Frontend Transport; Thu, 31 May 2018 09:00:17 +0000 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 179B4814DF5C; Thu, 31 May 2018 09:00:16 +0000 (UTC) Received: from rhel01.localdomain (ovpn-117-8.ams2.redhat.com [10.36.117.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id 73C6B2166BB2; Thu, 31 May 2018 09:00:15 +0000 (UTC) From: Adrian Reber <adrian@lisas.de> To: <criu@openvz.org>, Andrei Vagin <avagin@virtuozzo.com> Date: Thu, 31 May 2018 09:00:02 +0000 Message-ID: <1527757205-12889-2-git-send-email-adrian@lisas.de> In-Reply-To: <1527757205-12889-1-git-send-email-adrian@lisas.de> References: <1527757205-12889-1-git-send-email-adrian@lisas.de> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Thu, 31 May 2018 09:00:16 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Thu, 31 May 2018 09:00:16 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'adrian@lisas.de' RCPT:'' X-EOPAttributedMessage: 0 X-EOPTenantAttributedMessage: 0bc7f26d-0264-416e-a6fc-8352af79c58f:0 X-Forefront-Antispam-Report: CIP:66.187.233.73; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(8076002)(2980300002)(428003)(199004)(189003)(47776003)(8676002)(75402003)(305945005)(4326008)(106466001)(7636002)(50466002)(336012)(48376002)(16586007)(110136005)(36756003)(86362001)(26005)(6666003)(77096007)(74482002)(76176011)(5660300001)(59450400001)(51416003)(1096003)(446003)(14003)(486006)(356003)(246002)(2616005)(11346002)(126002)(6266002)(105586002)(476003)(107886003); DIR:INB; SFP:; SCL:1; SRVR:AM4PR0801MB1603; H:mx1.redhat.com; FPR:; SPF:None; LANG:en; PTR:mx3-rdu2.redhat.com; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; HE1EUR01FT023; 1:yP+4P7tymX6iZy2HiZw77Vq9x2a69ef0j6AN/Ysy6Uorg1hHoLCO5EWilYAGNQ+c2UtHV6TcFFZk9SQO2EZtKoY5TDny4XKUv0rgQZIdgNOVi4FlzoPUtIdLAdVcdG3b MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(5600026)(4605076)(1401150)(71702078); SRVR:AM4PR0801MB1603; X-Microsoft-Exchange-Diagnostics: 1; AM4PR0801MB1603; 3:MwK1fKIZJqzdM3fKWWV/ZNsG7PW0M+hS8PU58FYr9jQPfdfqHSmzpH4b+Uv7vBsHwdyZ7dIWm0MdQ24Mygo7P6OWuFqcDtOFrec9IImQhTbFYvfzLpM+bAoBYWf5k/Olwoj+o1aPEStioQrwsz/3w4AVk9uuJakHLzBXMt9eA0mRe6F+VbKqvPH8oV4mdoF7RC9h80hcUJDzTkKht61hrDYsow0iUi65i0UbDjrwB64F4T87ClyN9aB3ZVHjgx1PmFPQtZWZ/0lBcLkMYRtX2lVZg1UA1Iy2Vjz6NtdlNPCVVCHNkMAAFAkOlj+5v1Z3FgD9OQv4iAiOB4f6+LW3mcSqkqvTYTq7rcOwaKrv40g=; 25:VZtBAhZHf0aA/VWLiYTbEjoJQbVKVvxj546FSNRZ71IMQFPHkE4P6B4oJ5yN9PgptRRkSkbyXEvYLwE5kdbqXFn5a0Yzs5WX1AQ5+LKV7el7ht0OrUyZdr8h6e510sm2xGF+mo4qid7rwVFZJWekv37quI+PMFqN03VJfd5juPVBXEWFspqvpuyY+B/K1dtXNKgCjveMSnDQik67vaWwN4JnJufPIjCtn9x76Q2aAGEyB1lvB93MiEYdFSRpnUYISmuHSV6mSWbEgmV7b8jCtZFE5nAnQL6sfXIzx5J5KiVbLS7alR2fo0wyuXkcs6e9yroPbC5hwB6x5/65tA/HuQ== X-MS-TrafficTypeDiagnostic: AM4PR0801MB1603: X-Microsoft-Exchange-Diagnostics: 1; AM4PR0801MB1603; 31:ZLEJMjoxsU+94gbCOW5VDm51Hee0rNPJCNnYtLugzxlA/2T2zrXlugsWRAUkFO/sT5+W4pbcK9dyNBC4zx6jfcy+IRLON/E2U6bEkwpTDR+UEW2qXJkxVIMmBQ+yIS7p8RD6/EYcXdivMhh3sANBP/rZJq5CZfYxIAh+mAdd5WR7Zo2KPIUCW5cjE9vjqdJ+1KCRYh6zXiXwd0hS7QRJrQTka5kOlO+zFHiP8aJ6S5E=; 20:KUc6t5sqlhZAqYADL8s6bHkGu+AXPs2xYgF9BF6FNlm+DMfwbnVNcoMR0V5vjoOcp7VchxXiRr3uul1wkEbo5y60KoXU2J2biwlWrdDPB/wk0MEOSxhflY/P/WEqT9iegNMs7U4rcCWyA6yxthjM1DSfUS94IiR101+pjkPlVneMXtEJER4s+Biww9yjNznmCXaTbbpLRZH9k1du4F2zB9Lfacwp4mIeuwfp+ThnfBBxGjgm29IMJHTICI/SMpXLi84yTZ0SRiofZZ5qV8d0LxsEp2GCAUEDgvsPGJ8fhEMtEcv7ObS9Q8+Cfz5ROQXYyvX7z/OYfqQRTCqMXO4hq7/xiwfa/fHljgpOqHmUH2foaK4tgHDBdQhcYmxYefFW5SKnsNUWF0OZfScsyi6ykQPr9z9fEnOhtxpD8Zup3qpS4wUtHNS096RhDBiJAV4TnpoyE0tx9UDfVNyrqHOrV9hufVVey8XEf0t5CXMA7A5+RCYAUBPrRKm74uQ3lAvq X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(2401047)(8121501046)(1430428)(1431068)(1551054)(823300258)(823330077)(9101536074)(10201501046)(3002001)(12181506113)(3231254)(901025)(902075)(913088)(7045084)(944500087)(944510158)(944921075)(946801078)(946901078)(52103095)(52104123)(52105095)(52106170)(52401190)(52601095)(52505095)(52406095)(52305095)(52206095)(93006095)(93001095)(1610001)(8301001075)(8301003183)(9300000083)(9301000104)(201708071742011)(7699016); SRVR:AM4PR0801MB1603; BCL:0; PCL:0; RULEID:; SRVR:AM4PR0801MB1603; X-Microsoft-Exchange-Diagnostics: 1; AM4PR0801MB1603; 4:tbpRIIbc+rdJDGjxfaDVyZZkDVin9yNUAtfSfOjabgr7+RGCP/O9IItf4FVQThhaSvanHQ0BfyQZnrsiHcXyfmtK9YsOHtU5vTMmDzbM4Kup3kRLrRs6ZX8sZVRdG8/bskflZPmK2bL6YvrTbPoRMpErl+rHFzNlhBNKf9KbPIwfQxuo1/UR/nIMHbuHBIa95wtcO5uWP+0bsJ2lPiaw7CsxuoHf6FLf55mza1qwMSi5Rc5QM6577QQM9i7ePfcatOfSfs/awjau6M4q+cNLeg== X-Microsoft-Exchange-Diagnostics: 1; AM4PR0801MB1603; 23:G7DJB6l+7tZBbkfXeIjhiduQS6rGdqFe3jH8okyGwDzbK9wgRerasEVFwbLxgSFTRnqqIB04bPWFNgPgjiH8AeZtADyVG1VJw/LE0eQzkq+L9HWzQek9x9dVzsREpP4q485l8vlaQLhxew/BXDU/MrBCCDc6l0zVfaaFVtPhtbgQqRss6cTLV5BfwtM/ubN4lkwfBBfDDw2rrkSieDZyV8m6UpyWjC+aJ+68eMzxUGmGFwKESoUKAa7rACRexajSc2lljfpgA00k/KulNEcunyqdIRcZCN4Cc0otOX+Q5e7Pzuu0M2zk69EnyNvrkPknj4+obJWErle2QomU8OWtSrZSd2vQKhGWhBSQ6dt9jWugEvyQDpcVm7JAq+w8BWfxus7AExbANrNzw7lnT20E+Os5MxCKO8yVgXzFBOjoGIMqe04+UFs/azZQaHIKwQ5z9+3+M4O+48ortiWTY1xLa2BVY5hJMPAhrRAHSMn1gcYj9yul257Ai3VZe6i5beBfEEP/LQf0uI2MHZMRNIhXI/26Gl2JgS5DKwMLXINUdk67Z6PWOtgRh4qK9Ry7jxUmaWVQW7zI98lCoTlsIRkF+rw5M3n6VTJbVRCG/28FH+EW0LgL7iPoUffphCdR5BU/FjxWyVMzUebYcuZ1r2SsNG7hoe8vCX3SRURXm7tDP8NxEELer73YHCbymickn62x/EZxATHQmzqnijTldsFk2TTrtsNsFWEHMhBvWWae1JBvh4P7Ml1ZVZk8LEVKVvp2uQfrklTj/6upSr88LUDCY4FB/F29e2wuY0E57zKq2AUc+CnCCM8KTi0xMihqfV9jmS7ubmVThT1UYgz3arn6h/rIfl3a9/uppwZE1EkPXj29z5R+m7KHc8fskUHZS7E0Y3quAjGMe29Xmf4ijIgOKg== X-Microsoft-Antispam-Message-Info: +qGWqBWiwaxpD0MLe5IjrvhVI7HNjfjBN1QJOSbzj8f9COt+OqdyC5BNd5aLz9EWwbIxFxTO5E50lkfyDP9nbtuY1PISwFiBJ/BEm+wN0tWtdYjzCssUmze07S+E1qzgm/Zlun3IO7SHK/Uao5dCl3FYM2UpJHtZoyh+FLUfDy4uw6FB6PMKHS+D8xctDJXe39ctZfzd5a9T1R6xpYfchR9P/XaMG0hwjJkt0izD8V5dcK/t/DJKZ7z2KfiEBRq9EPXZJaQRJLsD/SeLHdy05DoKJUSs4B3qEB6wg2btzHrNyVNX5LbBDas/VJ3x8MW/N0WScRCgu7C7+fQGzOxonq/sSBBjIqOETr0lgpYZ6Kh8SwtYOhsev81CITbocxnuOXIUQrOYNiGqoLuTIxyGqM36M5yAk5xecYMsFe6VWfAldFtfZcG62tBTpVj/dwZBVnjVlobtDEYF7UA7PFVrRg== X-Microsoft-Exchange-Diagnostics: 1; AM4PR0801MB1603; 6:O1++2fOum0kfCyZa+SWtDAgMSumTMZeFl+RSh8aJ5KPmaEs4yiXB9rikX92QW+yDqKpNqsYSrg02zBH5Ui4TXwZxMdhegBuK4MvZ/U4XHQSm5U/hZeFR9gD51i8YoI2mdg8obj5eizTN7auol7ioUdF8AZ5Lv+rgrgofpLqdnS6IybHjJwLd3+J41A+dy8JUVUs6ZakfXRxnASLDvtI8+HyG7DrhG0ky4K6iuvukQeYWv4u9XscBWTwBx9L4OYBJKw2w/KGKtqUF0K2TAanqplOcUX+xQ84rEwtsRMOi3t8QbecT09cLVgKIhzm6TwM4cWaDjOppsxSn8XOYCQszMkHyhmjsxNGMI185VVOrmkg+K/AaxZCOP4i0TOGbWWBaKCETSLygTOCcQzAofxAotUoEKP+L8f0hWHFxpBwSn2wPjPNbFJpq0rz6DxA7w2P/Lsgr24QVm2KIrU7hd1nhYg==; 5:CQOcP42Gmhmp9T0loskSPItpdGwPi94AN4wtE1QHUZmRX83zCKIXtZde06aIg+ESe6JMkeVCFex13SAFh64bQdSyhQ0hDttBwC/sPqkK/mtU3C+vN5r+iPxOEt54In9RSxt6Yn+OLk9FjB7yPh015bgbauvcdJ+hre4SAoAVNUk=; 24:vR1SbGNTzfoVbJeVf6pPToFWV8lUOwZgnLIFdtJoL0yWVHmSmjJfbgUwk/JV3CMjPWTXcIJzGmDKa43sDwmVSfom7H79tSVUWhrmwgDYWuk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM4PR0801MB1603; 7:ktBHhUf3zWUMa8qYzKmwR9YC9ObmcIa/Y9KYGd1vtyHf7OtaVfNpOJT8xMYkO6Hagmf2qU4d9caZOfbm69Jmov8OqsJBCp3Aia9PO7Wmj3a9I+dUw8uVayOtmEczvkSuh0ynoJ5obLPKFD7g3o4AVUL6vG5lDlv6q0FHHTGMSDqTXZp2zKxjaPe7w7XGhenHqkWKzsvjgnIj39zjC4DmAgqjibbR50dETtH/y4feaOamOE8YryIktsQyDgNbQzSq; 20:L916+wj/zZzY8uu7dBLqNhgz622qz7L+om2zbg69MwH5HbmRGWMPCoU/mbK5qrmlZKyrSOUvw2sc0s019Qtp9B0XKZK43F6aHtGxjwK5CrkhqiroV+bkBe7/fHCUsFqTE4N4tz1MMRcvIF0iB6SjR/3hf3p9lvbzHVFbsgJu0kE= X-MS-Office365-Filtering-Correlation-Id: 3b8a857b-c2fb-4115-37c3-08d5c6d4ee53 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2018 09:00:17.0965 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3b8a857b-c2fb-4115-37c3-08d5c6d4ee53 X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR0801MB1603 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 66.187.233.73 X-MS-Exchange-CrossPremises-AuthSource: HE1EUR01FT023.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:Incoming; SFV:NSPM; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: AM4PR0801MB1603.eurprd08.prod.outlook.com Cc: Adrian Reber <areber@redhat.com> Subject: [CRIU] [PATCH 1/4] restore: do not kill restored process on failure X-BeenThere: criu@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: CRIU development <criu.openvz.org> List-Unsubscribe: <https://lists.openvz.org/mailman/options/criu>, <mailto:criu-request@openvz.org?subject=unsubscribe> List-Archive: <http://lists.openvz.org/pipermail/criu/> List-Post: <mailto:criu@openvz.org> List-Help: <mailto:criu-request@openvz.org?subject=help> List-Subscribe: <https://lists.openvz.org/mailman/listinfo/criu>, <mailto:criu-request@openvz.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: criu-bounces@openvz.org Errors-To: criu-bounces@openvz.org |
diff --git a/criu/cr-restore.c b/criu/cr-restore.c index e969c24..3564a9b 100644 --- a/criu/cr-restore.c +++ b/criu/cr-restore.c @@ -2556,8 +2556,8 @@ out_kill: struct pstree_item *pi; for_each_pstree_item(pi) - if (vpid(pi) > 0) - kill(vpid(pi), SIGKILL); + if (pi->pid->real > 0) + kill(pi->pid->real, SIGKILL); } out: