Merge pull request #328 from ablecloud-team/ablestack-diplo

diplo merge

Author: Dajeong-Park

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java

@@ -400,7 +400,7 @@ public String createHeartBeatCommand(HAStoragePool primaryStoragePool, String ho
                         rbdPoolName = pdef.getSourceDir();
                         authUserName = pdef.getAuthUserName();
                     }
-                    if (pdef.getPoolType() == PoolType.DIR) {
+                    if (pdef.getPoolType() == PoolType.DIR && !"/var/lib/libvirt/images".equals(pdef.getTargetPath())) {
                         logger.debug(String.format("SharedMountPoint Pool source path [%s]", pdef.getTargetPath()));
                         smpTargetPath = pdef.getTargetPath();
                     }
@@ -484,7 +484,7 @@ public Boolean checkingHeartBeat(HAStoragePool pool, HostTO host) {
                         rbdPoolName = pdef.getSourceDir();
                         authUserName = pdef.getAuthUserName();
                     }
-                    if (pdef.getPoolType() == PoolType.DIR) {
+                    if (pdef.getPoolType() == PoolType.DIR && !"/var/lib/libvirt/images".equals(pdef.getTargetPath())) {
                         logger.debug(String.format("SharedMountPoint Pool source path [%s]", pdef.getTargetPath()));
                         smpTargetPath = pdef.getTargetPath();
                     }
@@ -608,7 +608,7 @@ public Boolean vmActivityCheck(HAStoragePool pool, HostTO host, Duration activit
                         rbdPoolName = pdef.getSourceDir();
                         authUserName = pdef.getAuthUserName();
                     }
-                    if (pdef.getPoolType() == PoolType.DIR) {
+                    if (pdef.getPoolType() == PoolType.DIR && !"/var/lib/libvirt/images".equals(pdef.getTargetPath())) {
                         logger.debug(String.format("SharedMountPoint Pool source path [%s]", pdef.getTargetPath()));
                         smpTargetPath = pdef.getTargetPath();
                     }

scripts/vm/hypervisor/kvm/kvmheartbeat_clvm.sh

@@ -17,13 +17,13 @@
 # under the License.
 
 help() {
-  printf "Usage: $0 
+  printf "Usage: $0
                     -p rbd pool name
                     -n rbd pool auth username
                     -g sharedmountpoint type GFS2 path
                     -h host ip
                     -q clvm pool mount source path
-                    -r write/read hb log 
+                    -r write/read hb log
                     -c cleanup
                     -t interval between read hb log\n"
   exit 1
@@ -34,11 +34,11 @@ RbdPoolAuthUserName=
 GfsPoolPath=
 HostIP=
 poolPath=
-interval=
+interval=0
 rflag=0
 cflag=0
 
-while getopts 'p:n:g:h:q:t:r:c' OPTION
+while getopts 'p:n:g:h:q:t:rc' OPTION
 do
   case $OPTION in
   p)
@@ -55,23 +55,22 @@ do
      ;;
   q)
      poolPath="$OPTARG"
-     ;;  
+     ;;
   t)
      interval="$OPTARG"
      ;;
   r)
-     rflag=1 
+     rflag=1
      ;;
   c)
-    cflag=1
+     cflag=1
      ;;
   *)
      help
      ;;
   esac
 done
 
-
 hbFolder=$GfsPoolPath/MOLD-HB
 hbFile=$hbFolder/$HostIP
 
@@ -83,19 +82,18 @@ write_hbLog() {
   if [ $? -eq 0 ]
   then
     Timestamp=$(date +%s)
-    if [ -n $RbdPoolName ] ; then
+    if [ -n "$RbdPoolName" ]; then
       obj=$(rbd -p $RbdPoolName ls --id $RbdPoolAuthUserName | grep MOLD-HB)
       if [ $? -gt 0 ]; then
         rbd -p $RbdPoolName create --size 1 --id $RbdPoolAuthUserName MOLD-HB
       fi
-      obj=$(rbd -p $RbdPoolName --id $RbdPoolAuthUserName image-meta set MOLD-HB $HostIP $Timestamp)`
-
-    elif [ -n $GfsPoolPath ] ; then
+      obj=$(rbd -p $RbdPoolName --id $RbdPoolAuthUserName image-meta set MOLD-HB $HostIP $Timestamp)
+    elif [ -n "$GfsPoolPath" ] ; then
         stat $hbFile &> /dev/null
         if [ $? -gt 0 ] ; then
           mkdir -p $hbFolder &> /dev/null
           touch $hbFile &> /dev/null
-        if [ $? -gt 0 ] ; then
+          if [ $? -gt 0 ] ; then
             printf "Failed to create $hbFile"
             return 2
           fi
@@ -119,13 +117,13 @@ write_hbLog() {
 check_hbLog() {
 #check the heart beat log
   now=$(date +%s)
-  if [ -n $RbdPoolName ] ; then
+  if [ -n "$RbdPoolName" ] ; then
     getHbTime=$(rbd -p $RbdPoolName --id $RbdPoolAuthUserName image-meta get MOLD-HB $HostIP)
     if [ $? -gt 0 ] || [ -z "$getHbTime" ]; then
       return 1
     fi
     diff=$(expr $now - $getHbTime)
-  elif [ -n $GfsPoolPath ] ; then
+  elif [ -n "$GfsPoolPath" ] ; then
     now=$(date +%s)
     hb=$(cat $hbFile)
     diff=$(expr $now - $hb)

scripts/vm/hypervisor/kvm/kvmheartbeat_rbd.sh

@@ -93,14 +93,14 @@ if [ -n "$UUIDList" ]; then
       objId=$(rbd -p $PoolName info $uuid --id $PoolAuthUserName | grep 'id:')
       objId=${objId#*id: }
       res=$(timeout 3s bash -c "rados -p $PoolName touch rbd_object_map.$objId")
-    if [ $? -eq 0 ]; then
-      # 정상적인 touch 상태면 image meta에 key: uuid / value : timestamp 입력
-      rbd -p $PoolName --id $PoolAuthUserName image-meta set MOLD-AC $uuid $HostIP:$timestamp
-    else
-      # 정상적으로 touch 상태가 아니면 image meta에 key : uuid 삭제
-      rbd -p $PoolName --id $PoolAuthUserName image-meta rm MOLD-AC $uuid
-    fi
-  done
+      if [ $? -eq 0 ]; then
+        # 정상적인 touch 상태면 image meta에 key: uuid / value : timestamp 입력
+        rbd -p $PoolName --id $PoolAuthUserName image-meta set MOLD-AC $uuid $HostIP:$timestamp
+      else
+        # 정상적으로 touch 상태가 아니면 image meta에 key : uuid 삭제
+        rbd -p $PoolName --id $PoolAuthUserName image-meta rm MOLD-AC $uuid
+      fi
+    done
 fi
 
 #write the heart beat log

ui/public/locales/ko_KR.json

@@ -378,7 +378,7 @@
 "label.all.available.data": "\uc0ac\uc6a9 \uac00\ub2a5\ud55c \ubaa8\ub4e0 \ub370\uc774\ud130",
 "label.all.ipv6": "\ubaa8\ub4e0 IPv6",
 "label.all.zone": "\ubaa8\ub4e0 Zones",
-"label.allocated": "\ud560\ub2f9",
+"label.allocated": "\ud560\ub2f9\ub428",
 "label.allocatedonly": "\ud560\ub2f9",
 "label.allocationstate": "\ud560\ub2f9 \uc0c1\ud0dc",
 "label.allow": "\ud5c8\uc6a9",

ui/src/config/section/storage.js

@@ -226,7 +226,7 @@ export default {
           label: 'label.migrate.volume',
           args: ['volumeid', 'storageid', 'livemigrate'],
           dataView: true,
-          show: (record, store) => { return record.state === 'Ready' },
+          show: (record, store) => { return record.state === 'Ready' && !record.kvdoenable },
           popup: true,
           component: shallowRef(defineAsyncComponent(() => import('@/views/storage/MigrateVolume.vue')))
         },