[PATCH v2 compass-ci] specify the queues when the VM is started
[why] specify the VM that need to consume the queues one job will added one queue, but one VM can consume job from multi queues. [how] to solve this problem, the scheduler should obtains which queues should be request. solution-1: register mac and queues relation before: mac=>hostname change to: mac=>hostname and mac=>queues then scheduler can get queues based on mac solution-2: /boot.ipxe/mac/${mac}?queues=xxx,yyy our HW and PXE-VM use /tftpboot/boot.ipxe to send request, unable to specify parameter, so use solution-1. Signed-off-by: Xiao Shenwei <xiaoshenwei96@163.com> --- providers/my-qemu.sh | 4 +++- providers/qemu.sh | 12 ++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/providers/my-qemu.sh b/providers/my-qemu.sh index 954d3a0..7f3aa1b 100755 --- a/providers/my-qemu.sh +++ b/providers/my-qemu.sh @@ -4,6 +4,8 @@ [[ $tbox_group ]] || tbox_group=vm-2p8g -export hostname=$tbox_group--$USER-$$ +export hostname=$tbox_group.$USER-$$ +# specify which queues will be request, use " " to separate more than 2 values +export queues="vm-2p8g.aarch64 vm-2p8g~$USER" $CCI_SRC/providers/qemu.sh diff --git a/providers/qemu.sh b/providers/qemu.sh index d97fd85..6719e96 100755 --- a/providers/qemu.sh +++ b/providers/qemu.sh @@ -9,6 +9,7 @@ load_cci_defaults : ${hostname:="vm-1p1g-1"} +: ${queues:="vm-1p1g.$(arch)"} # unicast prefix: x2, x6, xA, xE export mac=$(echo $hostname | md5sum | sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/0a-\1-\2-\3-\4-\5/') echo hostname: $hostname @@ -17,7 +18,14 @@ echo $mac > mac echo "arp -n | grep ${mac//-/:}" > ip.sh chmod +x ip.sh -curl -X PUT "http://${SCHED_HOST:-172.17.0.1}:${SCHED_PORT:-3000}/set_host_mac?hostname=${hostname}&mac=${mac}" +set_mac2host() +{ + # use "," replace " " + queues=$(echo $queues | sed -r 's/ +/,/g') + echo $queues + curl -X PUT "http://${SCHED_HOST:-172.17.0.1}:${SCHED_PORT:-3000}/set_host_mac?hostname=${hostname}&mac=${mac}&queues=${queues}" +} +set_mac2host del_host_mac() { @@ -33,7 +41,7 @@ trap del_host_mac EXIT tbox_group=$hostname fi - host=${tbox_group%%--*} + host=${tbox_group%.*} create_yaml_variables "$LKP_SRC/hosts/${host}" -- 2.23.0
On Tue, Oct 27, 2020 at 05:27:43PM +0800, Xiao Shenwei wrote:
[why] specify the VM that need to consume the queues one job will added one queue, but one VM can consume job from multi queues.
[how] to solve this problem, the scheduler should obtains which queues should be request. solution-1: register mac and queues relation before: mac=>hostname change to: mac=>hostname and mac=>queues then scheduler can get queues based on mac
solution-2: /boot.ipxe/mac/${mac}?queues=xxx,yyy
our HW and PXE-VM use /tftpboot/boot.ipxe to send request, unable to specify parameter,
so use solution-1.
Signed-off-by: Xiao Shenwei <xiaoshenwei96@163.com> --- providers/my-qemu.sh | 4 +++- providers/qemu.sh | 12 ++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/providers/my-qemu.sh b/providers/my-qemu.sh index 954d3a0..7f3aa1b 100755 --- a/providers/my-qemu.sh +++ b/providers/my-qemu.sh @@ -4,6 +4,8 @@
[[ $tbox_group ]] || tbox_group=vm-2p8g -export hostname=$tbox_group--$USER-$$ +export hostname=$tbox_group.$USER-$$ +# specify which queues will be request, use " " to separate more than 2 values +export queues="vm-2p8g.aarch64 vm-2p8g~$USER"
$CCI_SRC/providers/qemu.sh diff --git a/providers/qemu.sh b/providers/qemu.sh index d97fd85..6719e96 100755 --- a/providers/qemu.sh +++ b/providers/qemu.sh @@ -9,6 +9,7 @@ load_cci_defaults
: ${hostname:="vm-1p1g-1"} +: ${queues:="vm-1p1g.$(arch)"} # unicast prefix: x2, x6, xA, xE export mac=$(echo $hostname | md5sum | sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/0a-\1-\2-\3-\4-\5/') echo hostname: $hostname @@ -17,7 +18,14 @@ echo $mac > mac echo "arp -n | grep ${mac//-/:}" > ip.sh chmod +x ip.sh
-curl -X PUT "http://${SCHED_HOST:-172.17.0.1}:${SCHED_PORT:-3000}/set_host_mac?hostname=${hostname}&mac=${mac}" +set_mac2host() +{ + # use "," replace " " + queues=$(echo $queues | sed -r 's/ +/,/g')
local queues=$(echo $queues | sed -r 's/ +/,/g')
+ echo $queues + curl -X PUT "http://${SCHED_HOST:-172.17.0.1}:${SCHED_PORT:-3000}/set_host_mac?hostname=${hostname}&mac=${mac}&queues=${queues}" +} +set_mac2host
del_host_mac() { @@ -33,7 +41,7 @@ trap del_host_mac EXIT tbox_group=$hostname fi
- host=${tbox_group%%--*} + host=${tbox_group%.*}
local host=${tbox_group%.*} Thanks sunyukui
create_yaml_variables "$LKP_SRC/hosts/${host}"
-- 2.23.0
On Wed, Oct 28, 2020 at 10:13:06AM +0800, Sun Yukui wrote:
On Tue, Oct 27, 2020 at 05:27:43PM +0800, Xiao Shenwei wrote:
[why] specify the VM that need to consume the queues one job will added one queue, but one VM can consume job from multi queues.
[how] to solve this problem, the scheduler should obtains which queues should be request. solution-1: register mac and queues relation before: mac=>hostname change to: mac=>hostname and mac=>queues then scheduler can get queues based on mac
solution-2: /boot.ipxe/mac/${mac}?queues=xxx,yyy
our HW and PXE-VM use /tftpboot/boot.ipxe to send request, unable to specify parameter,
so use solution-1.
Signed-off-by: Xiao Shenwei <xiaoshenwei96@163.com> --- providers/my-qemu.sh | 4 +++- providers/qemu.sh | 12 ++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/providers/my-qemu.sh b/providers/my-qemu.sh index 954d3a0..7f3aa1b 100755 --- a/providers/my-qemu.sh +++ b/providers/my-qemu.sh @@ -4,6 +4,8 @@
[[ $tbox_group ]] || tbox_group=vm-2p8g -export hostname=$tbox_group--$USER-$$ +export hostname=$tbox_group.$USER-$$ +# specify which queues will be request, use " " to separate more than 2 values +export queues="vm-2p8g.aarch64 vm-2p8g~$USER"
$CCI_SRC/providers/qemu.sh diff --git a/providers/qemu.sh b/providers/qemu.sh index d97fd85..6719e96 100755 --- a/providers/qemu.sh +++ b/providers/qemu.sh @@ -9,6 +9,7 @@ load_cci_defaults
: ${hostname:="vm-1p1g-1"} +: ${queues:="vm-1p1g.$(arch)"} # unicast prefix: x2, x6, xA, xE export mac=$(echo $hostname | md5sum | sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/0a-\1-\2-\3-\4-\5/') echo hostname: $hostname @@ -17,7 +18,14 @@ echo $mac > mac echo "arp -n | grep ${mac//-/:}" > ip.sh chmod +x ip.sh
-curl -X PUT "http://${SCHED_HOST:-172.17.0.1}:${SCHED_PORT:-3000}/set_host_mac?hostname=${hostname}&mac=${mac}" +set_mac2host() +{ + # use "," replace " " + queues=$(echo $queues | sed -r 's/ +/,/g')
local queues=$(echo $queues | sed -r 's/ +/,/g')
ok.
+ echo $queues + curl -X PUT "http://${SCHED_HOST:-172.17.0.1}:${SCHED_PORT:-3000}/set_host_mac?hostname=${hostname}&mac=${mac}&queues=${queues}" +} +set_mac2host
del_host_mac() { @@ -33,7 +41,7 @@ trap del_host_mac EXIT tbox_group=$hostname fi
- host=${tbox_group%%--*} + host=${tbox_group%.*}
local host=${tbox_group%.*}
ok Thanks, Shenwei
Thanks sunyukui
create_yaml_variables "$LKP_SRC/hosts/${host}"
-- 2.23.0
On Tue, Oct 27, 2020 at 05:27:43PM +0800, Xiao Shenwei wrote:
[why] specify the VM that need to consume the queues one job will added one queue, but one VM can consume job from multi queues.
[how] to solve this problem, the scheduler should obtains which queues should be request. solution-1: register mac and queues relation before: mac=>hostname change to: mac=>hostname and mac=>queues then scheduler can get queues based on mac
solution-2: /boot.ipxe/mac/${mac}?queues=xxx,yyy
our HW and PXE-VM use /tftpboot/boot.ipxe to send request, unable to specify parameter,
so use solution-1.
Signed-off-by: Xiao Shenwei <xiaoshenwei96@163.com> --- providers/my-qemu.sh | 4 +++- providers/qemu.sh | 12 ++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/providers/my-qemu.sh b/providers/my-qemu.sh index 954d3a0..7f3aa1b 100755 --- a/providers/my-qemu.sh +++ b/providers/my-qemu.sh @@ -4,6 +4,8 @@
[[ $tbox_group ]] || tbox_group=vm-2p8g -export hostname=$tbox_group--$USER-$$ +export hostname=$tbox_group.$USER-$$ +# specify which queues will be request, use " " to separate more than 2 values +export queues="vm-2p8g.aarch64 vm-2p8g~$USER"
$CCI_SRC/providers/qemu.sh diff --git a/providers/qemu.sh b/providers/qemu.sh index d97fd85..6719e96 100755 --- a/providers/qemu.sh +++ b/providers/qemu.sh @@ -9,6 +9,7 @@ load_cci_defaults
: ${hostname:="vm-1p1g-1"} +: ${queues:="vm-1p1g.$(arch)"} # unicast prefix: x2, x6, xA, xE export mac=$(echo $hostname | md5sum | sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/0a-\1-\2-\3-\4-\5/') echo hostname: $hostname @@ -17,7 +18,14 @@ echo $mac > mac echo "arp -n | grep ${mac//-/:}" > ip.sh chmod +x ip.sh
-curl -X PUT "http://${SCHED_HOST:-172.17.0.1}:${SCHED_PORT:-3000}/set_host_mac?hostname=${hostname}&mac=${mac}" +set_mac2host() +{ + # use "," replace " " + queues=$(echo $queues | sed -r 's/ +/,/g') + echo $queues + curl -X PUT "http://${SCHED_HOST:-172.17.0.1}:${SCHED_PORT:-3000}/set_host_mac?hostname=${hostname}&mac=${mac}&queues=${queues}"
add new API set_mac2host set_mac2queues Thanks, Shenwei
+} +set_mac2host
del_host_mac() { @@ -33,7 +41,7 @@ trap del_host_mac EXIT tbox_group=$hostname fi
- host=${tbox_group%%--*} + host=${tbox_group%.*}
create_yaml_variables "$LKP_SRC/hosts/${host}"
-- 2.23.0
participants (2)
-
Sun Yukui -
Xiao Shenwei