[Pkg-ganeti-devel] [ganeti] 03/04: Fix KVM CPU affinity setting

Apollon Oikonomopoulos apoikos at moszumanska.debian.org
Thu Aug 3 02:07:49 UTC 2017


This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository ganeti.

commit dd27067ee4d794784349e0bfcc28b655d87dd41f
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Wed Aug 2 21:19:47 2017 -0400

    Fix KVM CPU affinity setting
    
    Restore compatibility with current psutil versions.
    
    Closes: #864754
---
 debian/patches/fix-cpu-affinity.patch | 20 ++++++++++++++++++++
 debian/patches/series                 |  1 +
 2 files changed, 21 insertions(+)

diff --git a/debian/patches/fix-cpu-affinity.patch b/debian/patches/fix-cpu-affinity.patch
new file mode 100644
index 0000000..ac50083
--- /dev/null
+++ b/debian/patches/fix-cpu-affinity.patch
@@ -0,0 +1,20 @@
+Author: Apollon Oikonomopoulos <apoikos at debian.org>
+Description: Fix CPU affinity setting with current psutil versions
+ The set_cpu_affinity() method has been deprecated since psutil 2.0 (2014). Use
+ cpu_affinity() instead.
+Bug-Debian: https://bugs.debian.org/864754
+Forwarded: no
+--- a/lib/hypervisor/hv_kvm/__init__.py
++++ b/lib/hypervisor/hv_kvm/__init__.py
+@@ -721,9 +721,9 @@
+ 
+     target_process = psutil.Process(process_id)
+     if cpus == constants.CPU_PINNING_OFF:
+-      target_process.set_cpu_affinity(range(psutil.cpu_count()))
++      target_process.cpu_affinity(range(psutil.cpu_count()))
+     else:
+-      target_process.set_cpu_affinity(cpus)
++      target_process.cpu_affinity(cpus)
+ 
+   @classmethod
+   def _AssignCpuAffinity(cls, cpu_mask, process_id, thread_dict):
diff --git a/debian/patches/series b/debian/patches/series
index 2c7e7b1..8f188da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@ use-hv-class-to-check-for-migration.patch
 do-not-specify-socat-ssl-method.patch
 fix-ftbfs-with-sphinx-1.5.patch
 fix-failover-from-dead-node.patch
+fix-cpu-affinity.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git



More information about the Pkg-ganeti-devel mailing list