From 469e377d6e39fd8f82e221a3e9c555808fcc926b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 25 Sep 2018 16:12:14 -0500 Subject: Remove mapper nice priority This is a revert of eff3d02a180ef60102f1f25d765b2ddf72831be3 A direct revert is not possible due to our subtree refactoring Prioritizing one application over another seems to cause more problems then it solves. In this case it appears that mapper can starve other process's in which mapper depends on responding. So that dependent process times out, restarts, which then causes the whole cycle to start over. Hoping this is the fix to openbmc/openbmc#3369 but will require some testing. Tested: George was kind enough to run this through some BMC reboot tests and a regression bucket. openbmc/openbmc#3369 did not recreate but not willing to declare success yet with that bug. (From meta-ibm rev: 9effdef83644fff90a2bcb6f4d6fb97ac28fcb28) Change-Id: I9af8ab369966a69c09d807d888b0bf5a0f0b3e07 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- .../recipes-phosphor/dbus/phosphor-mapper.bbappend | 7 ------- .../recipes-phosphor/dbus/phosphor-mapper/mapper-nice.conf | 2 -- 2 files changed, 9 deletions(-) delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-mapper.bbappend delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-mapper/mapper-nice.conf (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-mapper.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-mapper.bbappend deleted file mode 100644 index 668ee9374..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-mapper.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -MAPPER_SVC = "xyz.openbmc_project.ObjectMapper.service" - -MAPPER_DROPIN_DIR = "${MAPPER_SVC}.d" - -SYSTEMD_OVERRIDE_${PN} += "mapper-nice.conf:${MAPPER_DROPIN_DIR}/mapper-nice.conf" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-mapper/mapper-nice.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-mapper/mapper-nice.conf deleted file mode 100644 index 5464cb53e..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-mapper/mapper-nice.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Service] -Nice=-5 \ No newline at end of file -- cgit v1.2.3