Hi Pete, Vijay has merged the fix for this. Can you try it out and let me know? Thanks, -peter Peter Portante <pportant@xxxxxxxxxx> writes: > Thanks for noticing, Pete. > > Unfortunately, I have a number of commits backed up behind the review of the existing one which will address this problem that you have identified below (which we missed in the review due to lack of testing on my part ... bugger all). > > Sorry, > > -peter > > > ----- Original Message ----- >> From: "Kaleb Keithley" <kkeithle@xxxxxxxxxx> >> To: "Pete Zaitcev" <zaitcev@xxxxxxxxxx> >> Cc: "Peter Portante" <peter.portante@xxxxxxxxxx>, gluster-devel@xxxxxxxxxx >> Sent: Tuesday, November 6, 2012 2:43:51 PM >> Subject: Re: Looping import in Swift w/cae3216a >> >> 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@xxxxxxxxxx> >> To: "Peter Portante" <peter.portante@xxxxxxxxxx> >> Cc: gluster-devel@xxxxxxxxxx, "Kaleb KEITHLEY" <kkeithle@xxxxxxxxxx>, >> "Vijay Bellur" <vbellur@xxxxxxxxxx> >> 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 >> >> _______________________________________________ >> Gluster-devel mailing list >> Gluster-devel@xxxxxxxxxx >> https://lists.nongnu.org/mailman/listinfo/gluster-devel >>
