Skip to content

PYTHON-436 Add support for a maximum number of open connections #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 74 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
c523245
PYTHON-436 Initial support for capping the number of connections in a…
Mar 15, 2013
3286702
PYTHON-436 Fix double-return of the socket in _send_message
Mar 15, 2013
079f819
PYTHON-436 end_request already returns the socket to the pool, re-add…
Mar 16, 2013
c31e09d
PYTHON-436 All tests (that don't skip) pass with these hacks. Now tha…
Mar 16, 2013
e728b26
PYTHON-436 Remove the hacks and fix the tests to work with a Queue in…
Mar 16, 2013
9b27f83
PYTHON-436 Remove incorrect super
Mar 16, 2013
ccef8c1
Add max_open_sockets option to MongoClient
Mar 16, 2013
45e48fb
PYTHON-436 Add tests for max_open_sockets in Pool
Mar 16, 2013
48562ce
Add reversefold (me) to contributors
Mar 17, 2013
f87ee21
PYTHON-436 It turns out the switch to Queue wasn't needed so I've rev…
Mar 17, 2013
1f7f764
PYTHON-436 Fix potential regression which wouldn't catch socket error…
Mar 17, 2013
e016d13
Merge branch 'master' of git://github.com/mongodb/mongo-python-driver
Mar 17, 2013
bab46d6
PYTHON-436 Fix tests to be Python 2.4 compatible
Mar 29, 2013
e732fb4
PYTHON-436 Remove unused import
Mar 29, 2013
5d6843d
Merge branch 'master' of git://github.com/mongodb/mongo-python-driver
Mar 29, 2013
f7abb5a
PYTHON-436 Backport Semaphore and BoundedSemaphore from CPython 3.2
Mar 29, 2013
73b6445
Remove unused import
Mar 29, 2013
4ba2cb6
PYTHON-436 Replace max_size with max_open_connections. Change default
Mar 29, 2013
074d579
PYTHON-436 When checking the request socket, acquire the semaphore
Mar 29, 2013
88a6d66
PYTHON-436 use assertTrue instead of assert_
Mar 29, 2013
985ca64
PYTHON-436 Add warning:: and fix version #
Mar 29, 2013
a97917f
PYTHON-436 greenlet/gevent support
Mar 30, 2013
e5eb5a3
PYTHON-436 only use force=True for pool.get_socket when called by the…
Mar 31, 2013
dec88be
PYTHON-436 remove SynchronizedCounter and the uses of self._lock
Mar 31, 2013
d2d542f
PYTHON-436 use gevent.thread.allocate_lock() instead of RLock to
Mar 31, 2013
bb4c2ac
PYTHON-436 fix tests to work with new max_pool_size
Mar 31, 2013
1f5e381
Add a comment for an used var
Apr 1, 2013
5918e87
PYTHON-436 reset the semaphore when resetting the pool
Apr 1, 2013
f21b8fa
PYTHON-436 test that multiple balanced start_request/end_request call…
Apr 1, 2013
c44e6f4
PYTHON-436 sanity check to make sure that we don't count or return so…
Apr 1, 2013
a411be5
PYTHON-436 Re-enable the tests that were failing
Apr 1, 2013
ee62367
PYTHON-436 (try to) unwatch the thread when the thread dies
Apr 2, 2013
b514db7
PYTHON-436 unwatching does not appear to work, but checking the weak …
Apr 2, 2013
794bee8
PYTHON-436 Don't reset the semaphore when resetting the pool. The num…
Apr 2, 2013
0edf22d
PYTHON-436 Remove unneeded Condition copy, gevent has its own Semaphore
Apr 2, 2013
fc9d756
PYTHON-436 fix versionchanged
Apr 2, 2013
f941b13
PYTHON-436 CPython 2.4 compatibility, only one of except or finally in
Apr 2, 2013
07a23c1
PYTHON-436 reinstate locking when returning socket to self.sockets fo…
Apr 2, 2013
44d021b
PYTHON-436 remove unused variable
Apr 2, 2013
1e4fdf4
PYTHON-436 remove unneeded TODO
Apr 2, 2013
7709979
PYTHON-436 add support for waitQueueTimeoutMS
Apr 2, 2013
5b849b9
PYTHON-436 Add support for waitQueueMultipleMS
Apr 2, 2013
8847ad6
PYTHON-436 use the cached tid so that unwatch() doesn't call get(), w…
Apr 2, 2013
7c0dd8b
PYTHON-436 remove unneeded comment, that issue has been fixed
Apr 3, 2013
ee03e3d
PYTHON-436 access the threadlocal before asserting to make sure that
Apr 3, 2013
843d697
PYTHON-436 more Python 2.4 fixes for try/except/finally
Apr 3, 2013
da7de8e
PYTHON-436 forgot to replace call to self.get() with tid to fix memor…
Apr 3, 2013
4b08202
PYTHON-436 trying to work around Python 2.6 thread death issues with …
Apr 5, 2013
26bdc40
PYTHON-436 gevent support doesn't need a monitor, the problem with
Apr 9, 2013
82654a9
PYTHON-436 when the monitor resets a request socket, set request stat…
Apr 9, 2013
b57ccd0
PYTHON-436 filter out special sock_info values before checking them
Apr 9, 2013
92a6ec4
PYTHON-436 fix the max_pool_size tests to work with the new behavior
Apr 9, 2013
aeb7512
PYTHON-436 Python 2.4 doesn't have any()
Apr 9, 2013
3e6bb6f
PYTHON-436 @ajdavis patch to go back to no monitor and using the
reversefold Apr 11, 2013
c4de08c
PYTHON-436 Clean up remaining monitor code
reversefold Apr 11, 2013
4048bf0
Remove extra var and comment on the call to threadlocal
reversefold Apr 11, 2013
ab90737
PYTHON-436 use another semaphore for max waiters instead of custom logic
Apr 11, 2013
e948e76
PYTHON-436 remove the unneeded call to the ident, fixing issues with
Apr 11, 2013
7ac4a56
PYTHON-436 add no-rendezvous tests which expose a race condition issue
Apr 11, 2013
35cb327
PYTHON-436 better skip error
Apr 11, 2013
a5cc7e6
Fix tests on Travis CI which require mutiprocessing
Apr 12, 2013
b07c18a
THON-436 remove temporary tests that weren't meant to be committed
Apr 12, 2013
a93f55b
make sure that mongodb is installed and running on travis ci
Apr 12, 2013
355f10c
Keep existing conf file
Apr 12, 2013
10c9e68
forgot sudo for mv
Apr 12, 2013
58f1cb4
Apparently mongodb is already installed, just make sure it's started
Apr 12, 2013
b4926b2
Never mind, mongo just appears to be broken sometimes on Travis CI
Apr 12, 2013
4d4e578
Merge branch 'master' of git://github.com/mongodb/mongo-python-driver
Apr 15, 2013
753dd28
PYTHON-436 add wait_queue options to validators
Apr 15, 2013
59d7d3e
PYTHON-436 unused import
Apr 15, 2013
a354932
PYTHON-436 Add missing :
Apr 15, 2013
fa0e7a0
PYTHON-436 queries -> operations
Apr 15, 2013
28a6952
PYTHON-436 Change max_pool_size to limit the maximum concurrent conne…
Apr 16, 2013
a1beeaa
Merge branch 'PYTHON-436'
Apr 16, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' of git://github.com/mongodb/mongo-python-driver
Conflicts:
	doc/contributors.rst
  • Loading branch information
Justin Patrin committed Mar 29, 2013
commit 5d6843dde3e290483023e1c48e8cdb7be36f7683
1 change: 1 addition & 0 deletions doc/contributors.rst
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,5 @@ The following is a list of people who have contributed to
- Michael Henson (hensom)
- Craig Hobbs (craigahobbs)
- Emily Stolfo (estolfo)
- Sam Helman (shelman)
- Justin Patrin (reversefold)
You are viewing a condensed version of this merge commit. You can view the full changes here.