From ffdfe67e4777f82688252181e6c92f07123fde82 Mon Sep 17 00:00:00 2001 From: OpenShift Cherrypick Robot Date: Sun, 21 Jan 2024 12:27:23 +0100 Subject: [PATCH] rps: fail silently when rps application failed (#901) In case the device gets removed completely, We want to hide the error, becuase we should not care of applying rps mask for devices which are gone anyway. Signed-off-by: Talor Itzhak Co-authored-by: Talor Itzhak --- assets/performanceprofile/scripts/set-rps-mask.sh | 9 ++++++--- .../default/manual_machineconfig.yaml | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/assets/performanceprofile/scripts/set-rps-mask.sh b/assets/performanceprofile/scripts/set-rps-mask.sh index cf2bc9373..8e6b1c83f 100644 --- a/assets/performanceprofile/scripts/set-rps-mask.sh +++ b/assets/performanceprofile/scripts/set-rps-mask.sh @@ -6,16 +6,19 @@ function set_queue_rps_mask() { path=${path/x2d/-} # set rps affinity for the queue echo "${mask}" 2> /dev/null > "/sys/${path}/rps_cpus" -# the 'echo' command might failed if the device path which the queue belongs to has changes -# this can happen in case of SRI-OV devices renaming +# we return 0 because the 'echo' command might fail if the device path to which the queue belongs has changed. +# this can happen in case of SRI-OV devices renaming. return 0 } function set_net_dev_rps_mask() { # in case of device we want to iterate through all queues for i in /sys/"${path}"/queues/rx-*; do - echo "${mask}" > "${i}/rps_cpus" + echo "${mask}" 2> /dev/null > "${i}/rps_cpus" done +# we return 0 because the 'echo' command might fail if the device path to which the queue belongs has changed. +# this can happen in case of SRI-OV devices renaming. +return 0 } path=${1} diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_machineconfig.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_machineconfig.yaml index e777155ff..4e42e0d7e 100644 --- a/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_machineconfig.yaml +++ b/test/e2e/performanceprofile/testdata/render-expected-output/default/manual_machineconfig.yaml @@ -33,7 +33,7 @@ spec: path: /usr/local/bin/hugepages-allocation.sh user: {} - contents: - source: data:text/plain;charset=utf-8;base64,IyEvdXNyL2Jpbi9lbnYgYmFzaAoKZnVuY3Rpb24gc2V0X3F1ZXVlX3Jwc19tYXNrKCkgewojIHJlcGxhY2UgeDJkIHdpdGggaHlwaGVuICgtKSB3aGljaCBpcyBhbiBlc2NhcGVkIGNoYXJhY3RlcgojIHRoYXQgd2FzIGFkZGVkIGJ5IHN5c3RlbWQtZXNjYXBlIGluIG9yZGVyIHRvIGVzY2FwZSB0aGUgc3lzdGVtZCB1bml0IG5hbWUgdGhhdCBpbnZva2VzIHRoaXMgc2NyaXB0CnBhdGg9JHtwYXRoL3gyZC8tfQojIHNldCBycHMgYWZmaW5pdHkgZm9yIHRoZSBxdWV1ZQplY2hvICIke21hc2t9IiAgMj4gL2Rldi9udWxsID4gIi9zeXMvJHtwYXRofS9ycHNfY3B1cyIKIyB0aGUgJ2VjaG8nIGNvbW1hbmQgbWlnaHQgZmFpbGVkIGlmIHRoZSBkZXZpY2UgcGF0aCB3aGljaCB0aGUgcXVldWUgYmVsb25ncyB0byBoYXMgY2hhbmdlcwojIHRoaXMgY2FuIGhhcHBlbiBpbiBjYXNlIG9mIFNSSS1PViBkZXZpY2VzIHJlbmFtaW5nCnJldHVybiAwCn0KCmZ1bmN0aW9uIHNldF9uZXRfZGV2X3Jwc19tYXNrKCkgewogICMgaW4gY2FzZSBvZiBkZXZpY2Ugd2Ugd2FudCB0byBpdGVyYXRlIHRocm91Z2ggYWxsIHF1ZXVlcwpmb3IgaSBpbiAvc3lzLyIke3BhdGh9Ii9xdWV1ZXMvcngtKjsgZG8KICBlY2hvICIke21hc2t9IiA+ICIke2l9L3Jwc19jcHVzIgpkb25lCiB9CgpwYXRoPSR7MX0KWyAtbiAiJHtwYXRofSIgXSB8fCB7IGVjaG8gIlRoZSBkZXZpY2UgcGF0aCBhcmd1bWVudCBpcyBtaXNzaW5nIiA+JjIgOyBleGl0IDE7IH0KCm1hc2s9JHsyfQpbIC1uICIke21hc2t9IiBdIHx8IHsgZWNobyAiVGhlIG1hc2sgYXJndW1lbnQgaXMgbWlzc2luZyIgPiYyIDsgZXhpdCAxOyB9CgppZiBbWyAiJHtwYXRofSIgPX4gInF1ZXVlcyIgXV07IHRoZW4KIHNldF9xdWV1ZV9ycHNfbWFzawplbHNlCiBzZXRfbmV0X2Rldl9ycHNfbWFzawpmaQo= + source: data:text/plain;charset=utf-8;base64,IyEvdXNyL2Jpbi9lbnYgYmFzaAoKZnVuY3Rpb24gc2V0X3F1ZXVlX3Jwc19tYXNrKCkgewojIHJlcGxhY2UgeDJkIHdpdGggaHlwaGVuICgtKSB3aGljaCBpcyBhbiBlc2NhcGVkIGNoYXJhY3RlcgojIHRoYXQgd2FzIGFkZGVkIGJ5IHN5c3RlbWQtZXNjYXBlIGluIG9yZGVyIHRvIGVzY2FwZSB0aGUgc3lzdGVtZCB1bml0IG5hbWUgdGhhdCBpbnZva2VzIHRoaXMgc2NyaXB0CnBhdGg9JHtwYXRoL3gyZC8tfQojIHNldCBycHMgYWZmaW5pdHkgZm9yIHRoZSBxdWV1ZQplY2hvICIke21hc2t9IiAgMj4gL2Rldi9udWxsID4gIi9zeXMvJHtwYXRofS9ycHNfY3B1cyIKIyB3ZSByZXR1cm4gMCBiZWNhdXNlIHRoZSAnZWNobycgY29tbWFuZCBtaWdodCBmYWlsIGlmIHRoZSBkZXZpY2UgcGF0aCB0byB3aGljaCB0aGUgcXVldWUgYmVsb25ncyBoYXMgY2hhbmdlZC4KIyB0aGlzIGNhbiBoYXBwZW4gaW4gY2FzZSBvZiBTUkktT1YgZGV2aWNlcyByZW5hbWluZy4KcmV0dXJuIDAKfQoKZnVuY3Rpb24gc2V0X25ldF9kZXZfcnBzX21hc2soKSB7CiAgIyBpbiBjYXNlIG9mIGRldmljZSB3ZSB3YW50IHRvIGl0ZXJhdGUgdGhyb3VnaCBhbGwgcXVldWVzCmZvciBpIGluIC9zeXMvIiR7cGF0aH0iL3F1ZXVlcy9yeC0qOyBkbwogIGVjaG8gIiR7bWFza30iIDI+IC9kZXYvbnVsbCA+ICIke2l9L3Jwc19jcHVzIgpkb25lCiMgd2UgcmV0dXJuIDAgYmVjYXVzZSB0aGUgJ2VjaG8nIGNvbW1hbmQgbWlnaHQgZmFpbCBpZiB0aGUgZGV2aWNlIHBhdGggdG8gd2hpY2ggdGhlIHF1ZXVlIGJlbG9uZ3MgaGFzIGNoYW5nZWQuCiMgdGhpcyBjYW4gaGFwcGVuIGluIGNhc2Ugb2YgU1JJLU9WIGRldmljZXMgcmVuYW1pbmcuCnJldHVybiAwCiB9CgpwYXRoPSR7MX0KWyAtbiAiJHtwYXRofSIgXSB8fCB7IGVjaG8gIlRoZSBkZXZpY2UgcGF0aCBhcmd1bWVudCBpcyBtaXNzaW5nIiA+JjIgOyBleGl0IDE7IH0KCm1hc2s9JHsyfQpbIC1uICIke21hc2t9IiBdIHx8IHsgZWNobyAiVGhlIG1hc2sgYXJndW1lbnQgaXMgbWlzc2luZyIgPiYyIDsgZXhpdCAxOyB9CgppZiBbWyAiJHtwYXRofSIgPX4gInF1ZXVlcyIgXV07IHRoZW4KIHNldF9xdWV1ZV9ycHNfbWFzawplbHNlCiBzZXRfbmV0X2Rldl9ycHNfbWFzawpmaQo= verification: {} group: {} mode: 448