Two modifications for DPDK image

1. workaround for creating snapshot
2. modify the parameters of Hugepage in vm

JIRA:YARDSTICK-233

Change-Id: I9cea76ed30dabe4fe2cb644e58ed0acd7dd8ecde
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>

diff --git a/tools/ubuntu-server-cloudimg-dpdk-modify.sh b/tools/ubuntu-server-cloudimg-dpdk-modify.sh
index edcbeb6..aa4e252 100755 (executable)
--- a/tools/ubuntu-server-cloudimg-dpdk-modify.sh
+++ b/tools/ubuntu-server-cloudimg-dpdk-modify.sh
@@ -33,8 +33,8 @@ grep wily /etc/apt/sources.list && \
 # Force apt to use ipv4 due to build problems on LF POD.
 echo 'Acquire::ForceIPv4 "true";' > /etc/apt/apt.conf.d/99force-ipv4
 
-echo 'GRUB_CMDLINE_LINUX="resume=/dev/sda1 default_hugepagesz=1G hugepagesz=1G hugepages=1 iommu=on iommu=pt intel_iommu=on"' >> /etc/default/grub
-echo 'vm.nr_hugepages=512' >> /etc/sysctl.conf
+echo 'GRUB_CMDLINE_LINUX="resume=/dev/sda1 default_hugepagesz=1G hugepagesz=1G hugepages=2 iommu=on iommu=pt intel_iommu=on"' >> /etc/default/grub
+echo 'vm.nr_hugepages=1024' >> /etc/sysctl.conf
 echo 'huge /mnt/huge hugetlbfs defaults 0 0' >> vi /etc/fstab
 
 mkdir /mnt/huge

diff --git a/tools/yardstick-img-dpdk-finalize.sh b/tools/yardstick-img-dpdk-finalize.sh
index b9ea83e..7a450e2 100644 (file)
--- a/tools/yardstick-img-dpdk-finalize.sh
+++ b/tools/yardstick-img-dpdk-finalize.sh
@@ -29,6 +29,9 @@ do
   fi
 done
 
+# workaround: Without wait time, the file size of pktgen is zero in the snapshot.
+sleep 60
+
 status=$(nova image-create --poll $stackname $new_image_name)
 if [[ "$status" =~ "Finished" ]];then
   echo "$new_image_name finished"