Message ID | 20180808054316.1556-1-avagin@virtuozzo.com |
---|---|
State | Accepted |
Series | "zdtm: handle inherit_fd-s in the rpc mode" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [64.233.162.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Wed, 08 Aug 2018 07:45:45 +0200 (CEST) Received: by 2002:ab3:1a94:0:0:0:0:0 with SMTP id 20-v6csp399902ltt; Tue, 7 Aug 2018 22:45:38 -0700 (PDT) X-Google-Smtp-Source: AA+uWPz6+IQ3hWuE6lJx8pguRRCunwR0gweCO+mceqEknc7lOlzKO4Z4T4B2UJd/j5piZVXc0yeT X-Received: by 2002:a50:d7cb:: with SMTP id m11-v6mr1530024edj.19.1533707138687; Tue, 07 Aug 2018 22:45:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533707138; cv=none; d=google.com; s=arc-20160816; b=0GyKiOAx79iVvayecl+psz7vxjx2JOsFWJquCPycam8FTpwvLbZ00QCkmPvO72hhhe oKjuc9+nWpB+JfJq8xaEcb8+eKDY7EKZtdkJOQq8YXWAjxHfqv/bOPqDJ9+o9O+aprW+ yRgw8HLx3dIlHGl1l8eTQLv6Df2gZpeP99hGlmksiSV6GxGr7rSp04xBowqvJSvBMnSM 25DpVXkA5ODP4clQIRy8P3b3ttI5BmuJLAY3/m+DXil6n3dQZazSWGVvMgsby8dIspK5 jIHulXCLAlfj7V3Q1T/D2rpER0gvEhWdWv6437VNmqZTz/npqpErDGYJnnf1qSZOG9Vw +GEQ== 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:spamdiagnosticoutput:mime-version:message-id:date:to:from :arc-authentication-results; bh=qDDG+ltZxNugWGlbjmB1o3b+rqWsbWGQlb9J1yLujQk=; b=wXKIi8eeQnD0bKWnfLIp2rs+XDkHgwi2sv7TOxVFxzdmEDn2InCivPpIq0eryTrDfF XNiMJz/EzNzlxyul6+pcLFPwWCs5+fvYB1Wl3FwLXTSo9TsMOWs/zvZWSAB8hr6v6noF 4Z5mcRCuuepx17MVtoVezv7W0rQu2qrfUPNRM0/cPUPJ9NS1k+f4z9y8Hg1u1cLAvdaM hNJWnCWPcRLWTrW5zRG4iNj3wRU40Ag6cXQ6SfoujVDhXGi30HM+DJGJtnPD1dFb/lQv 2UEzLz9Cl4IB31QBaEEwh4VN/KU/rmDgIMd8p7voxw3LMNTKeW316uHlHX3Yja85J17C TNTg== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com 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 x8-v6si3328536edr.318.2018.08.07.22.45.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Aug 2018 22:45:38 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: from localhost.localdomain (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id w785hdx4009930; Wed, 8 Aug 2018 08:43:46 +0300 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03lp0152.outbound.protection.outlook.com [213.199.154.152]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id w785hcJG009927 for <criu@openvz.org>; Wed, 8 Aug 2018 08:43:38 +0300 Authentication-Results: openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=none action=none header.from=virtuozzo.com; Received: from localhost.localdomain (67.203.153.2) by VI1PR08MB3264.eurprd08.prod.outlook.com (2603:10a6:803:3d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1038.19; Wed, 8 Aug 2018 05:43:39 +0000 From: Andrei Vagin <avagin@virtuozzo.com> To: criu@openvz.org Date: Wed, 8 Aug 2018 08:43:16 +0300 Message-Id: <20180808054316.1556-1-avagin@virtuozzo.com> X-Mailer: git-send-email 2.14.3 MIME-Version: 1.0 X-Originating-IP: [67.203.153.2] X-ClientProxiedBy: MWHPR1201CA0005.namprd12.prod.outlook.com (2603:10b6:301:4a::15) To VI1PR08MB3264.eurprd08.prod.outlook.com (2603:10a6:803:3d::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e6039534-3873-45aa-d4cd-08d5fcf1e4f0 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:VI1PR08MB3264; X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB3264; 3:Cjo/ENlXK4c2nv3sVdorjCIjxyBD4zp+squAr1Jd3l0XU/06SqYlFCR55PRFuQW9WAYr26xpoWUGh9t3UPYKPGzinYroaomSxWZ2HU2MLFjvp31+wsfOMOWi+a3U2g4xOvK2j+ym4ecsthWVg1GY3KfQx0xkEPgKoupGMS7PLf/kISfLQuhXZ/FHdkSrO16yHXU1BFZP+x0427dhKhW6eqJbYbZBLejXsrIXRzu6JYO2Gm9KgokTjEm0U4HZiNKv; 25:8Pzef126fHpYIUc+XqTl7J5teM4QwNvaBIkY3JwF5IxT47QGTb2OllVCEj62ezV0FdNnynueY/zeucwIONCLWJGM+p4CyUAFQo/les/CSdmEcVZT1rL0CkMsFZUNe+9hfp17QNt757ev7ryfi7qx5YVcArRfTAesU8cnYF0Jh6Su+3scJtBWUMea55WKRMyErcjIwPMGe2xF1qF3jXZjGzXVn6WatThui+lYDXwTtX2KyVkRpuGBtqSbVjNBe4l3sOFxWp9tckH1VoS6TBuGvz1LodAPfMrFnDKRPo/bV8Vm0C2niXR+elWiNZE8U0TaSMtHHOyOVgZe3ARjdYn6Vw==; 31:oR3ygmC7pLEuXtyg+fFRxlqDmEuT72keuuuiMYVdeuFsXOPvVUWHgmeSj/hpLaKffhI/lfMkQDZ7mEVNQH1VcbWryTFBZijsNjxZ6C+eGpZz3CQnXjnWAUecyylNlTm6rOj7+PvFRt3ZhkHwa2IYa79Mh8jd429u+xQmRtJ//NOMOndwO+EcIfO/xgPf4Pqj+qftTOvdfPc4dy64pGceORQwhqBO5rZhZ2SY4t+mQpk= X-MS-TrafficTypeDiagnostic: VI1PR08MB3264: X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB3264; 20:CgyOcB8Mw0tZjmA66ICdjk2/CH3fGsnkSY82ua7hdvY/j4jEq7MHLWVUCCHwOxzD6+24RojeqFowGOdve+RETIjpD/hc9y7/ss4sVs1sERsYl54PFjrOn5Ja2dMkPS5iWM/iW30QnEllYqOOiDj7hM7BHb4AF7mUXHmHoI3zo+zQu9K+iRZCjp+tKCoLHSwM+a+8nrjd/hQ8cJrlGC1V/c1W0LcgSMlkKk2jWnUzk5xAkpLR8ftltQi9PW7kJ41IxtHIDJnlJ2hApKqItLsHaCeW9WJuzlEzTODSVX8wox9eAb/bX88bGBAs40zrDJnXoiGPuYBfs0uxtGdI/g8SVx3tWIqU/5F+/mtypSASeZ0KCTH2436/3F6OmSSdrpySaafbfaKAH0VfMz7ZHxaQiD+wJ/vwcoMw1cicimnAWeyiyw3mNUKyWBhKHlN9eRMGAodQ+RXz07yPV8wYMNdgU7hsdjSVk71LbsgvfO/yUMUjIBu6RrYCLpw/r8lPqVCP; 4:kn7g/GHitEE+7N8fnJGzv/DxvOY96Bln3WE6tcchElngR0XEndGmjr3PeXg094jtOwScYnmrk5embE8h0omTIqhFrsnrpluzMpCdr7sywobWBYDHD1oZg8/HrbOptruOhRqoKQJldwY5ypRrUvBcsPnCHjU+LKN5ynw7tg/K1khNt1qrmr3iTVIu0lOYpRGGRG4mrBQIJbBD3RSMu5LpjU93g/5Y1DtanRh9wJoGfshaCwlEU+cTn6hZUoTyXzqALxtifhQiGJYZElHQ0HyUIw== X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101524173)(2401047)(8121501046)(823300264)(823310135)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(201708071742011)(7699016); SRVR:VI1PR08MB3264; BCL:0; PCL:0; RULEID:; SRVR:VI1PR08MB3264; X-Forefront-Antispam-Report: SFV:SKI; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:VI1PR08MB3264; H:localhost.localdomain; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB3264; 23:6Gr8uugS/rd/zeh9byFwWGwV5K3YxYw+d+NPKAN7O6pga/D279ejNSGjrIDiYE18nyYUY6dhw2XVY5yp6kXcjuUnUCutcsNBrqV3sVgSc+SoMgoapozDByCbQXxG44wWae59UyN9+thJcNN3EMGnuQ==; 6:+RlmA+aR60+RpHEipt3RkDaFe60ZWaCgXDZI1sfu1FRDUrQAGLSXmiZI7bCEeQvwxqhz6MDZNLQ0wNcNXyhE1qj47F0d89fQgXq+4zYZWk4xecQeU8xoKFt9lL9/MRXiYwJuAUo9yfMOSJJt9wQ9vf+/uoaf4D00Glu6qlHvvUqsLdeIyq0IByZCJ95dZy0b87X107w1k0U51irgi8+a4vmwtARcM+Tcs4C4ABaNT54iNM+a/AFy7Qxu7PczekHJ+L5VFXlf2527oizLrorBtkKXVsxcChDsOK68eCC2V3480kNvjB4YMqAcD2GIZIvEQSVxCc6uwmTlB5jzcHyLXGTvcjqmqHFp+YC9yAKM6fkUiqDD7cDgaqFpNBuWxoAEnwid3TKiOrtCmXJKJTMHN/sxOCyL3D1rIyMfZJ3bDRciufXawnI0UyaKzpi4QrsJ8OZC9T1tOuUtJ2UxtbT/wA==; 5:4rCsnffNmMNlycme1bKud+gYeuXMaRG1D19Tp88mJvLu9kbO8TwjQVozaMRm+OFKGB/wsSRrw0GdNFdtH3L5VH3B3qZI2CN2V8vtqJjqHZjsiClv4aaDHTLEsT0+BwOGIKiavrtm/6k55d6RgTvXG+Rrd6Bh8D8Ym+T3rBYifzM= X-Microsoft-Antispam-Message-Info: 9ZBt0VWauIDPpcAMWpTk6u2Ttuo2y3UsExZhZ5H2Qa2//7JoMkydhmlqaaIn9KGxLzq6GzTt3iBoXIV1sp3wzwlhoOBdP+VdcdP3l97L80b3V6gOV7pLl7n5/2YQdDaco3jE0Azb8wIBzKK193VHINdz0PpUYLYdfQ7hlND0fPufgAw3GUlbTJcTjivsvW1gbcEvnyz4z6+qF+5WlbPfmZwv2uVy/64EsT857gaaO6/guqT5K3Fq7pyFRdnMtSkvrwi+zD9WYVEH0+LuE9fpv4VGkSP7OtgYivxl0UN0a9/wdgwpd+seCcZjPeLIxERCU58J3Sujj0ib8eQomrvjTZ5SJ0BMsquGd5De4UwW1XY= SpamDiagnosticOutput: 1:0 X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB3264; 7:8lmTm3aQQSsyVts6iNnkiSAlPbnzF+4scUxvLLu3fRQr1zVyMlYmtugcivpuzFO5Ohj/3nszovdJ2ryjmX6RRfdGckKR6jnXmRhu5Fr/xEeIDwVmer0oOXXggJw/BIi7o5du477amgsFnRdZTqCgDbq/o4XgBfl4if8PJpEVz38ct+ToXlw5v1e8/Xh5VaK9zwEFI7eao3oW4nXdFW/hLx1iX0Ci49/PdgGgsc/iIsjm/v8aXWB8Iq2VXl/hFnL5; 20:HHjIC7Ydi6gfiQ6oSVtKU3zplkES8ZrMjHMxbyK5DN+zbFExiD07h2jxKcVQ+RKu0TZ4JyGWhhltaXkAfm3h8RKE+zuKmTGPmw1U+Mox1v7pHZf/a373+RQebKosNkvX857dta/8yfLUtpVBvGJ7v047ThPJOiZxUsLddFKf+Fs= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2018 05:43:39.0006 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e6039534-3873-45aa-d4cd-08d5fcf1e4f0 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB3264 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 67.203.153.2 X-MS-Exchange-CrossPremises-AuthSource: VI1PR08MB3264.eurprd08.prod.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Internal X-MS-Exchange-CrossPremises-AuthMechanism: 06 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:SKI; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: VI1PR08MB3264.eurprd08.prod.outlook.com Cc: Adrian Reber <areber@redhat.com>, Andrei Vagin <avagin@virtuozzo.com> Subject: [CRIU] [PATCH] zdtm: handle inherit_fd-s in the rpc mode 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/test/zdtm.py b/test/zdtm.py index c795490ae..d3b73c4df 100755 --- a/test/zdtm.py +++ b/test/zdtm.py @@ -814,6 +814,16 @@ class criu_rpc: if arg == '--tcp-established': criu.opts.tcp_established = True continue + if arg == '--restore-sibling': + criu.opts.rst_sibling = True + continue + if arg == "--inherit-fd": + inhfd = criu.opts.inherit_fd.add() + key = args.pop(0) + fd, key = key.split(":", 1) + inhfd.fd = int(fd[3:-1]) + inhfd.key = key + continue raise test_fail_exc('RPC for %s required' % arg)
./test//zdtm.py --set inhfd run --all --rpc Cc: Adrian Reber <areber@redhat.com> Signed-off-by: Andrei Vagin <avagin@virtuozzo.com> --- test/zdtm.py | 10 ++++++++++ 1 file changed, 10 insertions(+)