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 B4077A0555 for ; Wed, 19 Feb 2020 16:58:12 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AC1FB1BF7D; Wed, 19 Feb 2020 16:58:12 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 104F91BF7D for ; Wed, 19 Feb 2020 16:58:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582127891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1F4o3WjPMaEgpPlZURk7Yrv5byIbgEq1kG4zdUYgE9w=; b=gUddOmPSz+bpposTUn31iWsxo4MVveQZBa0J9jYTXSJmCa/tw9jiva9pYCY7mhwRe1yaq3 le4Z7GBWR7TGZg6FCM7oQWaW1UKha0Nm8fyyDAY5WhWn8IdmxOBxgNfJeIOUshRYIyWyQT RY1flet/er+DAnk9sWy98s8MPb3sWUM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-84-1A-Csm2aNaC8J2j55QCoeQ-1; Wed, 19 Feb 2020 10:58:07 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 26845100DFC3; Wed, 19 Feb 2020 15:58:06 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.109]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7ABCE811F8; Wed, 19 Feb 2020 15:58:01 +0000 (UTC) From: Kevin Traynor To: Ciara Power Cc: Robin Jarry , Kevin Laatz , dpdk stable Date: Wed, 19 Feb 2020 15:56:07 +0000 Message-Id: <20200219155607.20495-22-ktraynor@redhat.com> In-Reply-To: <20200219155607.20495-1-ktraynor@redhat.com> References: <20200219155607.20495-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: 1A-Csm2aNaC8J2j55QCoeQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'usertools: fix telemetry client with python 3' has been queued to LTS release 18.11.7 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 LTS release 18.11.7 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/25/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 rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/412970816782faf3ee= dcf407482225dd70b7b856 Thanks. Kevin. --- >From 412970816782faf3eedcf407482225dd70b7b856 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 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/usertools/dpdk-telemetry-client.py b/usertools/dpdk-telemetry-= client.py index 58174c0558..2f471d8411 100644 --- a/usertools/dpdk-telemetry-client.py +++ b/usertools/dpdk-telemetry-client.py @@ -3,4 +3,5 @@ =20 from __future__ import print_function +from __future__ import unicode_literals =20 import socket @@ -64,16 +65,17 @@ class Client: self.socket.send_fd.connect("/var/run/dpdk/rte/telemetry") JSON =3D (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 =3D self.socket.recv_fd.accept()[0] =20 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 + "\"}}").e= ncode()) self.socket.client_fd.close() =20 def requestMetrics(self): # Requests metrics for given client - self.socket.client_fd.send(METRICS_REQ) - data =3D self.socket.client_fd.recv(BUFFER_SIZE) - print("\nResponse: \n", str(data)) + self.socket.client_fd.send(METRICS_REQ.encode()) + data =3D self.socket.client_fd.recv(BUFFER_SIZE).decode() + print("\nResponse: \n", data) =20 def repeatedlyRequestMetrics(self, sleep_time): # Recursively requests= metrics for given client --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-19 15:43:50.867865687 +0000 +++ 0022-usertools-fix-telemetry-client-with-python-3.patch=092020-02-19 15= :43:49.766141283 +0000 @@ -1 +1 @@ -From af927da4d7d23f1050f23caf55f4ac2a995ab244 Mon Sep 17 00:00:00 2001 +From 412970816782faf3eedcf407482225dd70b7b856 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit af927da4d7d23f1050f23caf55f4ac2a995ab244 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -22,2 +23,2 @@ - usertools/dpdk-telemetry-client.py | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) + usertools/dpdk-telemetry-client.py | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) @@ -26 +27 @@ -index 290345dcc4..35edb7cd26 100755 +index 58174c0558..2f471d8411 100644 @@ -29 +30 @@ -@@ -4,4 +4,5 @@ +@@ -3,4 +3,5 @@ @@ -35 +36 @@ -@@ -66,16 +67,17 @@ class Client: +@@ -64,16 +65,17 @@ class Client: @@ -58,11 +58,0 @@ -@@ -89,7 +91,7 @@ class Client: -=20 - def requestGlobalMetrics(self): #Requests global metrics for given cl= ient -- self.socket.client_fd.send(GLOBAL_METRICS_REQ) -- data =3D self.socket.client_fd.recv(BUFFER_SIZE) -- print("\nResponse: \n", str(data)) -+ self.socket.client_fd.send(GLOBAL_METRICS_REQ.encode()) -+ data =3D self.socket.client_fd.recv(BUFFER_SIZE).decode() -+ print("\nResponse: \n", data) -=20 - def interactiveMenu(self, sleep_time): # Creates Interactive menu wit= hin the script