You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2013/07/26 01:34:55 UTC
git commit: updated refs/heads/4.2 to 3b39fb0
Updated Branches:
refs/heads/4.2 f59947c32 -> 3b39fb044
Bring back vm_data.sh which deleted by a KVM related commit
The following commit removed vm_data.sh, but the file shared by Xen as well.
Bring the file back.
commit 28855b4987c9274d15a539b9d7ae26c0073b0651
Author: Marcus Sorensen <ma...@betterservers.com>
Date: Wed Jul 24 13:58:17 2013 -0600
Summary: Get away from dozens of ssh/scp calls for KVM vm_data push
Detail: userdata and vm metadata take a long time to program on KVM routers.
This does it all in one go, processed on the router.
BUG-ID: CLOUDSTACK-3163
Tested-by: Wido
Signed-off-by: Marcus Sorensen <ma...@betterservers.com> 1374695897 -0600
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3b39fb04
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3b39fb04
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3b39fb04
Branch: refs/heads/4.2
Commit: 3b39fb04421424ebb1485c2a046708bb3661cd4c
Parents: f59947c
Author: Sheng Yang <sh...@citrix.com>
Authored: Thu Jul 25 16:32:35 2013 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Thu Jul 25 16:34:49 2013 -0700
----------------------------------------------------------------------
scripts/network/domr/vm_data.sh | 147 +++++++++++++++++++++++++++++++++++
1 file changed, 147 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3b39fb04/scripts/network/domr/vm_data.sh
----------------------------------------------------------------------
diff --git a/scripts/network/domr/vm_data.sh b/scripts/network/domr/vm_data.sh
new file mode 100644
index 0000000..c861723
--- /dev/null
+++ b/scripts/network/domr/vm_data.sh
@@ -0,0 +1,147 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
+# $Id: vm_data.sh 9307 2010-06-08 00:43:08Z chiradeep $ $HeadURL: svn://svn.lab.vmops.com/repos/vmdev/java/scripts/vm/hypervisor/xenserver/patch/vm_data.sh $
+# @VERSION@
+
+usage() {
+ printf "Usage: %s: -r <domr-ip> -v <vm ip> -F <vm data folder> -f <vm data file> -d <data to put in file> \n" $(basename $0) >&2
+ exit 2
+}
+
+set -x
+cert="/root/.ssh/id_rsa.cloud"
+PORT=3922
+
+create_htaccess() {
+ local domrIp=$1
+ local vmIp=$2
+ local folder=$3
+ local file=$4
+
+ local result=0
+ #rewrite rule in top level /latest folder to redirect
+ #to vm specific folder based on source ip
+ entry="RewriteRule ^$file$ ../$folder/%{REMOTE_ADDR}/$file [L,NC,QSA]"
+ htaccessFolder="/var/www/html/latest"
+ htaccessFile=$htaccessFolder/.htaccess
+ ssh -p $PORT -o StrictHostKeyChecking=no -i $cert root@$domrIp "mkdir -p $htaccessFolder; touch $htaccessFile; grep -F \"$entry\" $htaccessFile; if [ \$? -gt 0 ]; then echo -e \"$entry\" >> $htaccessFile; fi" >/dev/null
+ result=$?
+
+ if [ $result -eq 0 ]
+ then
+ #ensure that vm specific folder cannot be listed and that only
+ #the vm that owns the data can access the items in this directory
+ entry="Options -Indexes\\nOrder Deny,Allow\\nDeny from all\\nAllow from $vmIp"
+ htaccessFolder="/var/www/html/$folder/$vmIp"
+ htaccessFile=$htaccessFolder/.htaccess
+ ssh -p $PORT -o StrictHostKeyChecking=no -i $cert root@$domrIp "mkdir -p $htaccessFolder; echo -e \"$entry\" > $htaccessFile" >/dev/null
+ result=$?
+ fi
+
+ #support access by http://<dhcp server>/latest/<metadata key> (legacy, see above) also
+ # http://<dhcp server>/latest/meta-data/<metadata key> (correct)
+ if [ "$folder" == "metadata" ] || [ "$folder" == "meta-data" ]
+ then
+ entry="RewriteRule ^meta-data/(.+)$ ../$folder/%{REMOTE_ADDR}/\\\$1 [L,NC,QSA]"
+ htaccessFolder="/var/www/html/latest"
+ htaccessFile=$htaccessFolder/.htaccess
+ ssh -p $PORT -o StrictHostKeyChecking=no -i $cert root@$domrIp "grep -F \"$entry\" $htaccessFile; if [ \$? -gt 0 ]; then echo -e \"$entry\" >> $htaccessFile; fi" >/dev/null
+ entry="RewriteRule ^meta-data/$ ../$folder/%{REMOTE_ADDR}/meta-data [L,NC,QSA]"
+ ssh -p $PORT -o StrictHostKeyChecking=no -i $cert root@$domrIp "grep -F \"$entry\" $htaccessFile; if [ \$? -gt 0 ]; then echo -e \"$entry\" >> $htaccessFile; fi" >/dev/null
+ result=$?
+ fi
+
+ return $result
+}
+
+copy_vm_data_file() {
+ local domrIp=$1
+ local vmIp=$2
+ local folder=$3
+ local file=$4
+ local dataFile=$5
+
+ dest=/var/www/html/$folder/$vmIp/$file
+ metamanifest=/var/www/html/$folder/$vmIp/meta-data
+ scp -P $PORT -o StrictHostKeyChecking=no -i $cert $dataFile root@$domrIp:$dest >/dev/null
+ ssh -p $PORT -o StrictHostKeyChecking=no -i $cert root@$domrIp "chmod 644 $dest" > /dev/null
+ ssh -p $PORT -o StrictHostKeyChecking=no -i $cert root@$domrIp "touch $metamanifest; chmod 644 $metamanifest" > /dev/null
+ if [ "$folder" == "metadata" ] || [ "$folder" == "meta-data" ]
+ then
+ ssh -p $PORT -o StrictHostKeyChecking=no -i $cert root@$domrIp "sed -i '/$file/d' $metamanifest; echo $file >> $metamanifest" > /dev/null
+ fi
+
+ return $?
+}
+
+delete_vm_data_file() {
+ local domrIp=$1
+ local vmIp=$2
+ local folder=$3
+ local file=$4
+
+ vmDataFilePath="/var/www/html/$folder/$vmIp/$file"
+ ssh -p $PORT -o StrictHostKeyChecking=no -i $cert root@$domrIp "if [ -f $vmDataFilePath ]; then rm -rf $vmDataFilePath; fi" >/dev/null
+ return $?
+}
+
+domrIp=
+vmIp=
+folder=
+file=
+dataFile=
+
+while getopts 'r:v:F:f:d:' OPTION
+do
+ case $OPTION in
+ r) domrIp="$OPTARG"
+ ;;
+ v) vmIp="$OPTARG"
+ ;;
+ F) folder="$OPTARG"
+ ;;
+ f) file="$OPTARG"
+ ;;
+ d) dataFile="$OPTARG"
+ ;;
+ ?) usage
+ exit 1
+ ;;
+ esac
+done
+
+[ "$domrIp" == "" ] || [ "$vmIp" == "" ] || [ "$folder" == "" ] || [ "$file" == "" ] && usage
+[ "$folder" != "userdata" ] && [ "$folder" != "metadata" ] && usage
+
+if [ "$dataFile" != "" ]
+then
+ create_htaccess $domrIp $vmIp $folder $file
+
+ if [ $? -gt 0 ]
+ then
+ exit 1
+ fi
+
+ copy_vm_data_file $domrIp $vmIp $folder $file $dataFile
+else
+ delete_vm_data_file $domrIp $vmIp $folder $file
+fi
+
+exit $?