Changeset 1665:07f05953d331

Timestamp:

06/19/08 18:38:25 (2 months ago)

Author:

hadoopsandholm@…

Branch:

default

Message:

added ec2 compatibility client and server

Location:

src/grid/hadoop

Files:

• bin/LocalTime.py (added)
• bin/cloud-server (deleted)
• bin/deletevm (modified) (1 diff)
• bin/epochtime (modified) (1 diff)
• bin/th_create (modified) (1 diff)
• bin/th_expires (modified) (1 diff)
• bin/th_get-master-dns (added)
• bin/th_get-slaves-dns (added)
• bin/th_launch-time (added)
• ec2/aws-server (added)
• ec2/ec2-describe-images (added)
• ec2/ec2-describe-instances (added)
• ec2/ec2-run-instances (added)
• ec2/ec2-terminate-instances (added)
• java/hc.jar (modified) (previous)

src/grid/hadoop/bin/deletevm

@@ -4 +4 @@
 USER=`id -un`
 GETIP=`cat ${HADOOP_ROOT}/hadoop.conf | grep ipaddress | sed 's/ipaddress //'`
-if [ "$GETIP" == "yes" ]; then
-  tycoon -u ${USER} host bid $HOST 0 IPv4Address,$IP:0
-fi
+#if [ "$GETIP" == "yes" ]; then
+#  tycoon -u ${USER} host bid $HOST 0 IPv4Address,$IP:0
+#fi
 tycoon -u ${USER} host delete_account $HOST ${USER}

src/grid/hadoop/bin/epochtime

@@ -2 +2 @@
 import time
 import sys
-epoch = long(sys.argv[1])
-print time.ctime(epoch)
+if len(sys.argv) < 2:
+    print "-"
+else:
+    try:
+        epoch = long(sys.argv[1])
+        print time.ctime(epoch)
+    except:
+        print "-"

src/grid/hadoop/bin/th_create

@@ -1 +1 @@
 #!/bin/bash
 tycoon_hadoop delete
+python ${HADOOP_INSTALL}/bin/LocalTime.py >${HADOOP_ROOT}/.launchtime
 RET=`${HADOOP_INSTALL}/bin/gethosts $1`
 if [ "$RET" != "OK" ]; then

src/grid/hadoop/bin/th_expires

@@ -3 +3 @@
 MASTER=`tycoon_hadoop get-master`
 if [ "X$MASTER" != "X" ]; then
-IP=`cat ${HADOOP_ROOT}/.hosts | grep $MASTER | awk '{print $1}'`
-TIME=`tycoon -u ${USER} host get_account_status ${IP} bid['expiration'] | tail -n 1 | awk '{print $3}' | sed 's/L.*//'`
-${HADOOP_INSTALL}/bin/epochtime $TIME
+IP=`cat ${HADOOP_ROOT}/.hosts 2>/dev/null | grep $MASTER | awk '{print $1}'`
+TIME=
+if [ "X${IP}" != "X" ]; then
+    TIME=`tycoon -u ${USER} host get_account_status ${IP} bid['expiration'] 2>/dev/null | tail -n 1 | awk '{print $3}' | sed 's/L.*//'`
+fi
+if [ "X${TIME}" == "X" ]; then
+    echo "-"
+else
+    ${HADOOP_INSTALL}/bin/epochtime $TIME
+fi
 else
   echo "-"