summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "fix bug with replace old *LOs"1.7.0Jenkins2013-09-221-1/+1
|\
| * fix bug with replace old *LOsDavid Goetz2013-09-101-1/+1
| | | | | | | | Change-Id: I9e6278b62608cf36fa7e5e228f234cc8199c17fc
* | Sync with global requirementsMonty Taylor2013-09-133-13/+10
|/ | | | | | | Specifically, removing d2to1 is the important part. While we're at it though, use hacking to get the pyflakes/pep8 pins. Change-Id: Ic4a43955526fcde313ad2f2afec8fafeb87f37a6
* Merge "Added support for running the tests under PyPy with tox"1.6.0Jenkins2013-08-291-1/+1
|\
| * Added support for running the tests under PyPy with toxAlex Gaynor2013-08-281-1/+1
| | | | | | | | | | | | This is a precursor to having them run under check and gate. Change-Id: Ia512b68b5b47a88d5f7c1015cdf7151c322d293d
* | Remove redundant unit suffixStanislaw Pitucha2013-08-281-1/+1
|/ | | | | | | Transfer speed already has a "MB/s" unit. The "s" suffix was probably a copy/paste mistake. Change-Id: Iccd7894d5ca11aac8a9f98365834c5d3deef0720
* Merge "Reformat help outputs"Jenkins2013-08-261-70/+194
|\
| * Reformat help outputsJakub Krajcovic2013-08-191-70/+194
| | | | | | | | | | | | | | | | | | | | | | Reformatted the help outputs in the swift client to bring them more in line with the rest of the openstack clients. Changes were added to all of the st_command_help variables and a new variable st_command_options was added to help with correct formatting of help outputs. Change-Id: I0c549cf96292384ddb36b43ecec41a883d8b2e13 Implements: changes to help outputs
* | Add a NullHandler when setting up library loggingClay Gerrard2013-08-171-0/+15
|/ | | | | | | | | | I was gunna write a test, but mocking ImportErrors is a PITA, so I decided to just get my tox py26 working instead. Tests seem to fail/pass as expected without/with the inline NullHanlder. Closes-Bug: 1212861 Change-Id: I20207374a77ee9969ab201c3a57e4caf40c02a61
* Merge "Added headers argument support to get_object()"Jenkins2013-08-022-4/+27
|\
| * Added headers argument support to get_object()Stanislav Vitkovskiy2013-07-292-4/+27
| | | | | | | | | | | | | | | | With this change conditional and range GETs are possible, as documented in official API guide: http://docs.openstack.org/api/openstack-object-storage/1.0/content/retrieve-object.html Change-Id: Ib2ed1c21e8d3f1ed79c0b7e542ee022ee535835c
* | Assignment to reserved built-in symbol "file"Wu Wenxiang2013-08-021-4/+4
| | | | | | | | | | | | | | | | | | In file: tests/test_swiftclient.py, test_unicode_ok() & test_chunk_warning() Fixes bug #1207736 Change-Id: I0a822802ec8910e9aec36ae5af775f8abb384d34
* | Move multi-threading code to a library.Darrell Bishop2013-07-289-463/+928
|/ | | | | | | | | | | | | | | | | | | | | | This patch extracts the multi-threading code from bin/swift into swiftclient/multithreading and adds tests. In particular, this new way of doing it (with context managers) will prevent non-daemonic threads from wedging the process when unexpected exceptions happen. I enabled reporting of which lines, specifically, are not covered by unit tests (added -m option to "coverage report" in .unittests). This patch includes a drive-by fix for uploading a segmented file with --use-slo when that object already exists. A key of "name" was used instead of "path", raising KeyError. There's also another drive-by fix for uploading segmented objects with --use-slo. Commit 874e0e4427b80e1b15b74a1557b73ba9d61443ca regressed this by removing the capturing of thread-worker results in QueueFunctionThread.run(). This patch restores that functionality and the feature (uploading SLO objects). Change-Id: I0b4f677e4a734e83d1a25088d9a74f7d46384e53
* fix(gitignore) : Ignore *.egg filesTheSriram2013-07-241-0/+1
| | | | Change-Id: If52f9570a17230af9636f5337973e506c142b0bc
* Merge "python3: Start of adding basic python3 support."Jenkins2013-07-232-2/+2
|\
| * python3: Start of adding basic python3 support.Chuck Short2013-07-182-2/+2
| | | | | | | | | | | | | | Fix imports so its python3 compliant. Change-Id: Ie08fe63b87e75bb099105ca1de860f9ab6c3340b Signed-off-by: Chuck Short <chuck.short@canonical.com>
* | Merge "Refuse carriage return in header value"Jenkins2013-07-232-3/+31
|\ \ | |/ |/|
| * Refuse carriage return in header valueKun Huang2013-07-122-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See bug #1188896. Comparing with Curl and Django, they both refuse carriage returns in header values, so the request() method on the HTTP(S)Connection instance returned by swiftclient.client.http_connection() will raise an InvalidHeadersException if any of the headers to be sent contain a newline. Drive-by fix for a couple of header values which were integers instead of strings (Content-Length getting set to zero). Fixes bug #1188896 Change-Id: Ic6afdb92882284f843aacb06d20f682ddcb47151
* | Added log statements in swift clientHemanth Makkapati2013-07-171-1/+5
| | | | | | | | | | | | | | | | | | Added log statements in swiftclient/client.py:_retry where exceptions are being raised. Fixes bug# 1202229 Change-Id: I727537177849d08bb9603aa884152bdebc62fb85
* | Update docstring for swiftclient.Connection.__init__Samuel Merritt2013-07-121-0/+2
| | | | | | | | | | | | | | There were two undocumented parameters in there, one introduced recently in 6411fd3, and the other some time before. Change-Id: I3a7d59e1c272b382b035b88ba5495bc1c57a3154
* | Merge "Adds max-backoff for retries in Connection."Jenkins2013-07-121-4/+5
|\ \ | |/ |/|
| * Adds max-backoff for retries in Connection.Mike Widman2013-07-121-4/+5
| | | | | | | | | | | | | | | | | | | | The max-backoff concept prevents the backoff used in _retry to double infinitely (which in turn causes wait times of an hour or more between retries). As per review, changed code to use min instead. Fixes: bug #1183542 Change-Id: Ic084f54069b7fa7a33604741487045c5e697ff06
* | Merge "Allow setting # of retries in the binary"Jenkins2013-07-121-0/+3
|\ \ | |/ |/|
| * Allow setting # of retries in the binaryBen McCann2013-07-081-0/+3
| | | | | | | | Change-Id: I7ef4f1f86cc6ea4937043ea7bf7d9526e23bd2c7
* | Merge "Allow storage url override for both auth vers."Jenkins2013-07-107-25/+62
|\ \
| * | Allow storage url override for both auth vers.Darrell Bishop2013-07-057-25/+62
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When --os-storage-url is specified on the command-line to bin/swift, it will override the used storage URL regardless of authentication for both authentication version 1 and version 2. This can be used to bypass a load-balancer to hit a specific proxy server for testing/debugging purposes. Within the client library, this feature is accessed by passing the desired storage URL into swiftclient.client.Conection.__init__() via the os_options keyword argument. For example: conn = Connection(auth_url, user, key, os_options={ 'object_storage_url': 'http://overridden.storage.url/AUTH_foo'}) This patch also adds a dependency on mock>=0.8.0, which is the same as openstack/swift. Change-Id: Id2a36ed6abffd65e7762b6beea5bbfc6c036e848
* | Note '-V 2' is necessary for auth 2.01.5.0Kun Huang2013-07-071-1/+2
|/ | | | | | | | | | Here are some questions in Launchpad, just because they miss '-V 2' for auth 2.0. https://answers.launchpad.net/swift/+question/231938 https://answers.launchpad.net/swift/+question/231279 So I add somethins for noteing people add the '-V 2' Change-Id: I2e0fef969be4eca316975de03fdbc516a1069acf
* Merge "Add -p option to download command."Jenkins2013-07-051-130/+151
|\
| * Add -p option to download command.Darrell Bishop2013-06-261-130/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the ability to download a subset of containers (--all with -p) or a subset of objects within a container (container name with -p). This patch also includes a drive-by fix for "download --all" which would not actually download any objects (for me, at least) because the object queue got filled with "stop" messages before the container workers had run long enough to put work in the object queue. Doh! I also closed up a few holes where an (unexpected, obviously) Exception could cause the process to hang because non-daemon threads still existed. Change-Id: I71c6935c60282b5353badc2dfce8a935d47e3bb7
* | Merge "Add *.swp into .gitignore"Jenkins2013-06-282-0/+2
|\ \
| * | Add *.swp into .gitignoreKun Huang2013-06-272-0/+2
| |/ | | | | | | Change-Id: I76c92d82647ac9d042f6c117918feb5820a47678
* | add -t for totals to list command and --lh to statMark Seger2013-06-261-19/+50
|/ | | | Change-Id: Ieaba5e7762032bf9a2652ead39870d55e85b4672
* Merge "Remove explicit distribute depend."Jenkins2013-06-261-2/+0
|\
| * Remove explicit distribute depend.Monty Taylor2013-06-111-2/+0
| | | | | | | | | | | | | | Causes issues with the recent re-merge with setuptools. Advice from upstream is to stop doing explicit depends. Change-Id: If1a97a574dbc0370a0a2de5d99a92610b048907d
* | add optional 'response_dict' parameters to many calls into which they'llMark Seger2013-06-201-29/+120
| | | | | | | | | | | | return a dictionary of the response status, reason and headers Change-Id: I35f8824537f0484362dd6646c91789fac02fa075
* | Merge "Fixes re-auth flow with expired tokens."Jenkins2013-06-191-3/+5
|\ \
| * | Fixes re-auth flow with expired tokens.EdLeafe2013-06-131-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The re-authentication of expired tokens assumed that the 401 would always occur on the first HTTP at tempt. This fix changes that so that re-auth is still only attempted once, but no longer has to be on the first attempt. Change-Id: I93a1187da3637287a803a59c146256d4f543c9d5 Fixes: bug #1131142
* | | Merge "python3: Introduce py33 to tox.ini"Jenkins2013-06-131-1/+1
|\ \ \ | |/ / |/| |
| * | python3: Introduce py33 to tox.iniChuck Short2013-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Introduce py33 to tox.ini to make testing with python3 easier. Change-Id: Ibffa28107fdf1d1ae88223d84de4a7282c7882e0 Signed-off-by: Chuck Short <chuck.short@canonical.com>
* | | Merge "Add -l and --lh switches to swift 'list' command"Jenkins2013-06-112-6/+76
|\ \ \
| * | | Add -l and --lh switches to swift 'list' commandMark Seger2013-06-102-6/+76
| |/ / | | | | | | | | | | | | | | | | | | Also updated man page and added an example in 'list' command help message Change-Id: Icf38de9bab6d387a9a1deed444a91f68b4389cfe
* | | Merge "Changed the call to set_tunnel to work in python 2.6 or python 2.7 ↵Jenkins2013-06-111-1/+6
|\ \ \ | |_|/ |/| | | | | since its name changed between versions"
| * | Changed the call to set_tunnel to work in python 2.6 or python 2.7 since its ↵Greg Lange2013-06-071-1/+6
| |/ | | | | | | | | | | name changed between versions Change-Id: I5550049435002b42c4fea06d41549a1e7254ac02
* | Add option to disable SSL compressionStuart McLaren2013-06-044-9/+133
|/ | | | | | | | | | | Allows optionally disabling SSL compression. This can significantly improve HTTPS upload/download performance in some cases -- in particular when the object is not compressible and you have very high network bandwidth. Implements blueprint ssl-compression. Change-Id: I1260055f9c2e83cdabfeb51aed11b3899bed4d55
* Rename requires files to standard names.niu-zglinux2013-05-303-2/+2
| | | | | | | | | Rename tools/pip-requires to requirements.txt and tools/test-requires to test-requirements.txt. These are standard files, and tools in the general world are growing intelligence about them. Change-Id: I9c1356f22f6527be44b4b3f6a77012156ff1637b Fixes: bug #1179008
* remove busy-wait so that swift client won't use up all CPU cyclesTong Li2013-05-291-117/+61
| | | | | | | | | | | | The current implementation uses busy-wait and checking flags to communicate between threads. It wastes a lot of CPU powers. With python 2.6 is required for Swift, the communication between threads should now be using queue and signal mechanisms. This patch removed the busy-wait loops and use queue and queue join for threads coordination which will not consume CPU cycles if a thread is blocked. Change-Id: I648cd637a92a159d5c13baa83f357cee2dfe7937
* log get_auth request url instead of x-storage-urlLeah Klearman2013-05-221-1/+1
| | | | | | because if the request gets a 4xx error, then the url will be None, and that's just confusing. Change-Id: I62729364b9bd279498909dc5cd0d2a1ec5fcd70d
* Update the man pagePete Zaitcev2013-05-211-34/+32
| | | | | | | | | | - Add -V option - Use uniform and correct capitalization for OpenStack Swift - Make the example of output of stat command up-to-date - Generally prettify the document - Remove all trailing whitespace Change-Id: Id3da2035851847c4bff8cec8f927d3654824bf5b
* Merge "Add end_marker and path query parameters"Jenkins2013-05-212-13/+91
|\
| * Add end_marker and path query parametersYUZAWA Takahiko2013-05-052-13/+91
| | | | | | | | | | | | Fix Bug 1175057 Change-Id: I1bf65fa7c4d99ddb03dd183fe3862df93455f501