GlusterFS: Increase snapshot delete job timeout to two hours

Increase the timeout for Nova snapshot delete operations from ten
minutes to two hours.  This helps prevent Cinder from terminating
operations prematurely that are still being processed by Nova.

It is not uncommon for snapshot delete jobs to run for longer than
ten minutes depending on the size of the snapshot and speed of the
storage backend.

This will be followed up with a more robust mechanism to keep track
of snapshot job progress as a later effort.

Related-Bug: 1273894

Change-Id: I1ad52568aed1ce1bf593e71704e481b6fe5f44fb

diff --git a/cinder/volume/drivers/glusterfs.py b/cinder/volume/drivers/glusterfs.py
index 01238d9d3adfd7362861ee47837f6a104e0e6f9f..7b98d9153c80912ec43a8098ececfead235049ad 100644 (file)
--- a/cinder/volume/drivers/glusterfs.py
+++ b/cinder/volume/drivers/glusterfs.py
@@ -799,7 +799,7 @@ class GlusterfsDriver(nfs.RemoteFsDriver):
         # An update of progress = '90%' means that Nova is done
         seconds_elapsed = 0
         increment = 1
-        timeout = 600
+        timeout = 7200
         while True:
             s = db.snapshot_get(context, snapshot['id'])