From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 36586A0553 for ; Mon, 17 Feb 2020 18:47:37 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2EA961DA12; Mon, 17 Feb 2020 18:47:37 +0100 (CET) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by dpdk.org (Postfix) with ESMTP id 04BCF1DAB9 for ; Mon, 17 Feb 2020 18:47:35 +0100 (CET) Received: by mail-wr1-f41.google.com with SMTP id c9so20813242wrw.8 for ; Mon, 17 Feb 2020 09:47:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=htIu5VJ/kYxaMBqeQJZ7XwAFoIluoYRQ/uzHkQkKYJM=; b=mSdHNOkmlqNLRkXhUhokg0h0yDecPvd8/nbaU2pYU0y9HCwpwLLb6ENb+iJpJaTeUD gKL4f+/i2sxOW0VuCN9rJW2bXDThFVQIRhQem1KX/gjUHW+OsSMusS6cFzoAuI/BiY1U 3Fr5Dhy0w/Uobq9972fqAGrUULEDPJdJv4L3Vu8V2fAyCX9bXxq5319ZwS7yfS/2kEYB MQV7QdL4xFC9Pqa9wiAriPKZpwmz+sSzgEkeydU0tCXhU4ylVfJNAz/Y1eYw8YqqhFoc vbsDdTQRSPzAhcBRTCXWlIO1d/Pq/sOwEgn+lsd1t4HSc/tpMLZHJp92ruZB6FlOtqyF Rnpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=htIu5VJ/kYxaMBqeQJZ7XwAFoIluoYRQ/uzHkQkKYJM=; b=ea0Rhc5/AgZ1smy4mGTHxNOGmYTF49ZyqEC8yuMPnMDnDDyiBWuSf432B1oJDH7YC9 9MpDGJjokAEvn/LOuSrvVEZ5FoEJu8UteQB4zQ2uILtX5cPeuqUf3ZWxjy8occYz54k+ 30r4G1W+GFUONbK6pR14qnQW4DMJvljsfKcLOPJYlAiV5xWyPHxUwIwUzIREXaX8VGFD WqI9muo9EpAogmjjO6GuSSROPkgok4olQwNVK0Os0fYoLL0wu95XSL90FkurIVX6bYYt zaSDXqlSz2IC27bCDn/Fb1RXpCDmweilokATe76jgN4R0gKJRFhRhIH3RrrySECKS++4 LIgw== X-Gm-Message-State: APjAAAX+Mcon40H6tj8JD8Zb1JDTKmxdkSZXgZIYI8uIFhR9E/dmmN2Q RRvViZOkvQwnIjE3ta1Vr5IxKt3Fh+UqjQ== X-Google-Smtp-Source: APXvYqxdIJW54H5JqF7VVZLlE7vMXtkeC6TjCkRIfqyolBIcQ1RZOAT69dHTxZlwD6sUC02avi9kYw== X-Received: by 2002:adf:f3cd:: with SMTP id g13mr23997640wrp.54.1581961654683; Mon, 17 Feb 2020 09:47:34 -0800 (PST) Received: from localhost (userh634.uk.uudial.com. [194.69.103.7]) by smtp.gmail.com with ESMTPSA id q1sm2086445wrw.5.2020.02.17.09.47.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2020 09:47:34 -0800 (PST) From: luca.boccassi@gmail.com To: Ciara Power Cc: Robin Jarry , Kevin Laatz , dpdk stable Date: Mon, 17 Feb 2020 17:45:46 +0000 Message-Id: <20200217174546.25334-54-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200217174546.25334-1-luca.boccassi@gmail.com> References: <20200211112216.3929-190-luca.boccassi@gmail.com> <20200217174546.25334-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'usertools: fix telemetry client with python 3' has been queued to stable release 19.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/19/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From af5dd262a7a91819b8c652255d434e93b87896ff Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Tue, 21 Jan 2020 17:03:10 +0000 Subject: [PATCH] usertools: fix telemetry client with python 3 [ upstream commit af927da4d7d23f1050f23caf55f4ac2a995ab244 ] The client script for use with the telemetry library did not support Python3, as the data being sent over the socket was in string format. Python3 requires the data be explicitly converted to bytes before being sent. Similarly, the received bytes need to be decoded into string format. Fixes: 53f293c9a783 ("usertools: replace unsafe input function") Fixes: fe35622659ed ("usertools: fix telemetry client with python 3") Fixes: d1b94da4a4e0 ("usertools: add client script for telemetry") Fixes: 4080e46c8078 ("telemetry: support global metrics") Signed-off-by: Ciara Power Reviewed-by: Robin Jarry Acked-by: Kevin Laatz --- usertools/dpdk-telemetry-client.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/usertools/dpdk-telemetry-client.py b/usertools/dpdk-telemetry-client.py index 290345dcc4..35edb7cd26 100755 --- a/usertools/dpdk-telemetry-client.py +++ b/usertools/dpdk-telemetry-client.py @@ -3,6 +3,7 @@ # Copyright(c) 2018 Intel Corporation from __future__ import print_function +from __future__ import unicode_literals import socket import os @@ -65,18 +66,19 @@ class Client: self.socket.recv_fd.settimeout(2) self.socket.send_fd.connect("/var/run/dpdk/rte/telemetry") JSON = (API_REG + self.file_path + "\"}}") - self.socket.send_fd.sendall(JSON) + self.socket.send_fd.sendall(JSON.encode()) + self.socket.recv_fd.listen(1) self.socket.client_fd = self.socket.recv_fd.accept()[0] def unregister(self): # Unregister a given client - self.socket.client_fd.send(API_UNREG + self.file_path + "\"}}") + self.socket.client_fd.send((API_UNREG + self.file_path + "\"}}").encode()) self.socket.client_fd.close() def requestMetrics(self): # Requests metrics for given client - self.socket.client_fd.send(METRICS_REQ) - data = self.socket.client_fd.recv(BUFFER_SIZE) - print("\nResponse: \n", str(data)) + self.socket.client_fd.send(METRICS_REQ.encode()) + data = self.socket.client_fd.recv(BUFFER_SIZE).decode() + print("\nResponse: \n", data) def repeatedlyRequestMetrics(self, sleep_time): # Recursively requests metrics for given client print("\nPlease enter the number of times you'd like to continuously request Metrics:") @@ -88,9 +90,9 @@ class Client: time.sleep(sleep_time) def requestGlobalMetrics(self): #Requests global metrics for given client - self.socket.client_fd.send(GLOBAL_METRICS_REQ) - data = self.socket.client_fd.recv(BUFFER_SIZE) - print("\nResponse: \n", str(data)) + self.socket.client_fd.send(GLOBAL_METRICS_REQ.encode()) + data = self.socket.client_fd.recv(BUFFER_SIZE).decode() + print("\nResponse: \n", data) def interactiveMenu(self, sleep_time): # Creates Interactive menu within the script while self.choice != 4: -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-17 17:00:16.805849510 +0000 +++ 0054-usertools-fix-telemetry-client-with-python-3.patch 2020-02-17 17:00:15.379951475 +0000 @@ -1,8 +1,10 @@ -From af927da4d7d23f1050f23caf55f4ac2a995ab244 Mon Sep 17 00:00:00 2001 +From af5dd262a7a91819b8c652255d434e93b87896ff Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Tue, 21 Jan 2020 17:03:10 +0000 Subject: [PATCH] usertools: fix telemetry client with python 3 +[ upstream commit af927da4d7d23f1050f23caf55f4ac2a995ab244 ] + The client script for use with the telemetry library did not support Python3, as the data being sent over the socket was in string format. Python3 requires the data be explicitly converted to bytes before being @@ -13,7 +15,6 @@ Fixes: fe35622659ed ("usertools: fix telemetry client with python 3") Fixes: d1b94da4a4e0 ("usertools: add client script for telemetry") Fixes: 4080e46c8078 ("telemetry: support global metrics") -Cc: stable@dpdk.org Signed-off-by: Ciara Power Reviewed-by: Robin Jarry