From ffbbc35ca83057c8b3dd1e780cbd4c4ff80bb69b Mon Sep 17 00:00:00 2001
From: Neil Williams <neil@reddit.com>
Date: Wed, 18 Apr 2012 10:54:56 -0700
Subject: [PATCH] Add TimeoutExpired to OPERATIONAL_EXCEPTIONS.

---
 r2/r2/lib/base.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/r2/r2/lib/base.py b/r2/r2/lib/base.py
index 82930f9b1..efdcfbcb6 100644
--- a/r2/r2/lib/base.py
+++ b/r2/r2/lib/base.py
@@ -35,6 +35,7 @@ from r2.lib.template_helpers import get_domain
 from utils import storify, string2js, read_http_date
 from r2.lib.log import log_exception
 import r2.lib.db.thing
+import r2.lib.lock
 
 import re, hashlib
 from urllib import quote
@@ -44,6 +45,7 @@ import sys
 
 OPERATIONAL_EXCEPTIONS = (_pylibmc.MemcachedError,
                           r2.lib.db.thing.NotFound,
+                          r2.lib.lock.TimeoutExpired,
                           sqlalchemy.exc.OperationalError,
                           sqlalchemy.exc.IntegrityError,
                           pycassa.pool.AllServersUnavailable,