[Gluster-devel] Looping import in Swift w/cae3216a

[Kaleb Keithley]

The swift tree is in transition while we review and merge bite-sized pieces into the source.

(And the swift.diff file is eventually going away.)

----- Original Message -----
From: "Pete Zaitcev" <zaitcev at redhat.com>
To: "Peter Portante" <peter.portante at redhat.com>
Cc: gluster-devel at nongnu.org, "Kaleb KEITHLEY" <kkeithle at redhat.com>, "Vijay Bellur" <vbellur at redhat.com>
Sent: Tuesday, November 6, 2012 2:16:09 PM
Subject: Looping import in Swift w/cae3216a

Dear Peter:

I pulled the latest Gluster tip today from git, and it containes
a commit cae3216a, "object-storage: use constants for directory names".
In there, we have this:

+++ b/swift/1.4.8/plugins/utils.py
@@ -19,6 +19,7 @@ import errno
 import xattr
 from hashlib import md5
 from swift.common.utils import normalize_timestamp, TRUE_VALUES
+from swift.obj.server import ASYNCDIR
 import cPickle as pickle
.............

But the existing swift.diff adds an opposing import, like so:

+++ b/swift/obj/server.py
@@ -45,6 +46,10 @@ from swift.common.exceptions import ConnectionTimeout, DiskFileError, \
     DiskFileNotExist
 from swift.obj.replicator import tpooled_get_hashes, invalidate_hash, \
     quarantine_renamer
+from swift.plugins.utils import plugin_enabled
+if plugin_enabled():
.............

The result is that "from swift.obj.server import ASYNCDIR" fails.

I suspect that something got inconsistent, for example maybe you have
moved plugin_enabled() into common in your tree.

Greetings,
-- Pete

cc: to signed-off