@@ -1,3 +1,9 @@

+2008-03-05  Michal Ludvig  <michal@logix.cz>

+

+	* s3cmd, S3/S3.py, S3/Utils.py: Throttle upload speed and retry 

+	  when upload failed.

+	  Report download/upload speed and time elapsed.

+

 2008-02-28  Michal Ludvig  <michal@logix.cz>

 	* Released version 0.9.6

@@ -44,6 +44,9 @@ class S3Error (Exception):

 			pass

 		return retval

+class S3UploadError(Exception):

+	pass

+

 class ParameterError(Exception):

 	pass

@@ -199,7 +202,6 @@ class S3(object):

 			headers["x-amz-acl"] = "public-read"

 		request = self.create_request("OBJECT_PUT", bucket = bucket, object = object, headers = headers)

 		response = self.send_file(request, file)

-		response["size"] = size

 		return response

 	def object_get_file(self, bucket, object, filename):

@@ -359,7 +361,7 @@ class S3(object):

 			raise S3Error(response)

 		return response

-	def send_file(self, request, file):

+	def send_file(self, request, file, throttle = 0, retries = 3):

 		method_string, resource, headers = request

 		info("Sending file '%s', please wait..." % file.name)

 		conn = self.get_connection(resource['bucket'])

@@ -369,23 +371,43 @@ class S3(object):

 			conn.putheader(header, str(headers[header]))

 		conn.endheaders()

 		file.seek(0)

+		timestamp_start = time.time()

 		size_left = size_total = headers.get("content-length")

 		while (size_left > 0):

 			debug("SendFile: Reading up to %d bytes from '%s'" % (self.config.send_chunk, file.name))

 			data = file.read(self.config.send_chunk)

 			debug("SendFile: Sending %d bytes to the server" % len(data))

-			conn.send(data)

+			try:

+				conn.send(data)

+			except Exception, e:

+				## When an exception occurs insert a 

+				if retries:

+					conn.close()

+					warning("Upload of '%s' failed %s " % (file.name, e))

+					throttle = throttle and throttle * 5 or 0.01

+					warning("Retrying on lower speed (throttle=%0.2f)" % throttle)

+					return self.send_file(request, file, throttle, retries - 1)

+				else:

+					debug("Giving up on '%s' %s" % (file.name, e))

+					raise S3UploadError

+

 			size_left -= len(data)

+			if throttle:

+				time.sleep(throttle)

 			info("Sent %d bytes (%d %% of %d)" % (

 				(size_total - size_left),

 				(size_total - size_left) * 100 / size_total,

 				size_total))

+		timestamp_end = time.time()

 		response = {}

 		http_response = conn.getresponse()

 		response["status"] = http_response.status

 		response["reason"] = http_response.reason

 		response["headers"] = convertTupleListToDict(http_response.getheaders())

-		response["data"] =  http_response.read()

+		response["data"] = http_response.read()

+		response["elapsed"] = timestamp_end - timestamp_start

+		response["size"] = size_total

+		response["speed"] = float(response["size"]) / response["elapsed"]

 		conn.close()

 		if response["status"] == 307:

@@ -430,6 +452,7 @@ class S3(object):

 		md5_hash = md5.new()

 		size_left = size_total = int(response["headers"]["content-length"])

 		size_recvd = 0

+		timestamp_start = time.time()

 		while (size_recvd < size_total):

 			this_chunk = size_left > self.config.recv_chunk and self.config.recv_chunk or size_left

 			debug("ReceiveFile: Receiving up to %d bytes from the server" % this_chunk)

@@ -443,9 +466,12 @@ class S3(object):

 				size_recvd * 100 / size_total,

 				size_total))

 		conn.close()

+		timestamp_end = time.time()

 		response["md5"] = md5_hash.hexdigest()

 		response["md5match"] = response["headers"]["etag"].find(response["md5"]) >= 0

+		response["elapsed"] = timestamp_end - timestamp_start

 		response["size"] = size_recvd

+		response["speed"] = float(response["size"]) / response["elapsed"]

 		if response["size"] != long(response["headers"]["content-length"]):

 			warning("Reported size (%s) does not match received size (%s)" % (

 				response["headers"]["content-length"], response["size"]))

@@ -79,8 +79,8 @@ def dateS3toUnix(date):

 	## treats it as "localtime". Anyway...

 	return time.mktime(dateS3toPython(date))

-def formatSize(size, human_readable = False):

-	size = int(size)

+def formatSize(size, human_readable = False, floating_point = False):

+	size = floating_point and float(size) or int(size)

 	if human_readable:

 		coeffs = ['k', 'M', 'G', 'T']

 		coeff = ""

@@ -190,9 +190,14 @@ def cmd_object_put(args):

 		real_filename = file

 		if Config().encrypt:

 			exitcode, real_filename, extra_headers["x-amz-meta-s3tools-gpgenc"] = gpg_encrypt(file)

-		response = s3.object_put_uri(real_filename, uri_final, extra_headers)

-		output("File '%s' stored as %s (%d bytes) [%d of %d]" %

-			(file, uri_final, response["size"],

+		try:

+			response = s3.object_put_uri(real_filename, uri_final, extra_headers)

+		except S3UploadError, e:

+			error("Upload of '%s' failed too many times. Skipping that file." % real_filename)

+			continue

+		speed_fmt = formatSize(response["speed"], human_readable = True, floating_point = True)

+		output("File '%s' stored as %s (%d bytes in %0.1f seconds, %0.2f %sB/s) [%d of %d]" %

+			(file, uri_final, response["size"], response["elapsed"], speed_fmt[0], speed_fmt[1],

 			seq, total))

 		if Config().acl_public:

 			output("Public URL of the object is: %s" %

@@ -246,8 +251,9 @@ def cmd_object_get(args):

 			gpg_decrypt(destination, response["headers"]["x-amz-meta-s3tools-gpgenc"])

 			response["size"] = os.stat(destination)[6]

 		if destination != "-":

-			output("Object %s saved as '%s' (%d bytes)" %

-				(uri, destination, response["size"]))

+			speed_fmt = formatSize(response["speed"], human_readable = True, floating_point = True)

+			output("Object %s saved as '%s' (%d bytes in %0.1f seconds, %0.2f %sB/s)" %

+				(uri, destination, response["size"], response["elapsed"], speed_fmt[0], speed_fmt[1]))

 def cmd_object_del(args):

 	s3 = S3(Config())

@@ -413,6 +419,8 @@ def cmd_sync(args):

 	total_size = 0

 	total_count = len(loc_list)

+	total_elapsed = 0.0

+	timestamp_start = time.time()

 	seq = 0

 	dst_base = dst_uri.uri()

 	if not dst_base[-1] == "/": dst_base += "/"

@@ -425,10 +433,21 @@ def cmd_sync(args):

 		if cfg.preserve_attrs:

 			attr_header = _build_attr_header(src)

 			debug(attr_header)

-		response = s3.object_put_uri(src, uri, attr_header)

-		output("stored '%s' as '%s' (%d bytes) [%d of %d]" % (src, uri, response["size"], seq, total_count))

+		try:

+			response = s3.object_put_uri(src, uri, attr_header)

+		except S3UploadError, e:

+			error("Upload of '%s' failed too many times. Skipping that file." % src)

+			continue

+		speed_fmt = formatSize(response["speed"], human_readable = True, floating_point = True)

+		output("File '%s' stored as %s (%d bytes in %0.1f seconds, %0.2f %sB/s) [%d of %d]" %

+			(src, uri, response["size"], response["elapsed"], speed_fmt[0], speed_fmt[1],

+			seq, total_count))

 		total_size += response["size"]

-	output("Done. Uploaded %d bytes." % total_size)

+

+	total_elapsed = time.time() - timestamp_start

+	speed_fmt = formatSize(total_size/total_elapsed, human_readable = True, floating_point = True)

+	output("Done. Uploaded %d bytes in %0.1f seconds, %0.2f %sB/s" % 

+	       (total_size, total_elapsed, speed_fmt[0], speed_fmt[1]))

 def resolve_list(lst, args):

 	retval = []