diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-07-22 05:33:09 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-07-22 05:33:09 +0300 |
| commit | 9adb6cd23905ce01d987ec3dfdef515768b4d208 (patch) | |
| tree | c337af63b4e2c882bc1f82213988b348341291bc /include | |
| parent | 6ad34a433978b1cb6eaf4db481ac55e4382b3ef4 (diff) | |
| download | rabbitmq-server-git-9adb6cd23905ce01d987ec3dfdef515768b4d208.tar.gz | |
Keep track of connections, introduce per-vhost limits
Fixes #500, #627.
Squashed commit of the following:
commit 88036dccbb28828ceed39d793b13a2d3d3b99b80
Author: Michael Klishin <mklishin@pivotal.io>
Date: Thu Jul 21 03:31:25 2016 +0300
Refactor
commit fc84b7a23735352da4cf95726b430fad984b837d
Merge: df745e2 df28c63
Author: Michael Klishin <mklishin@pivotal.io>
Date: Wed Jul 20 18:30:19 2016 +0300
Merge branch 'master' into rabbitmq-server-500
commit df745e2544824b882d174b99d1d4470d05ac78c8
Author: Michael Klishin <mklishin@pivotal.io>
Date: Wed Jul 20 18:04:59 2016 +0300
Force close connections when vhost is deleted
Fixes #627, related to #500.
commit 2167f8ffebe9473af482816822bb30a0694a1f3e
Author: Michael Klishin <mklishin@pivotal.io>
Date: Wed Jul 20 16:00:35 2016 +0300
Add tests for per-vhost connection limits
commit 2a032a3ac9cc3b01b07692456590e213e5d28806
Author: Michael Klishin <mklishin@pivotal.io>
Date: Wed Jul 20 01:53:07 2016 +0300
Rename a few tests
commit 86ce592db1516bb216d6dc45326ea80f55d14a30
Author: Michael Klishin <mklishin@pivotal.io>
Date: Wed Jul 20 01:44:10 2016 +0300
Tests for connection re-registration idempotency
commit a774c7bebe0d91c18af1a2035697c431dca28d89
Author: Michael Klishin <mklishin@pivotal.io>
Date: Tue Jul 19 04:05:20 2016 +0300
Ask nodes that come back to re-register their connections
Depending on the partition handling mode used there may or may not
be any clients still connected. We make sure that registration
and deregistration functions are idempotent and assume there
may be connections on the node that has come back.
Point of improvement: when a node comes back up, N-1 nodes
will tell it to re-register connections. It could be fewer
than N-1, ideally just 1.
commit 24e4c0e690f192d138e70000ada6335671275f0b
Author: Michael Klishin <mklishin@pivotal.io>
Date: Mon Jul 18 17:05:17 2016 +0300
Fix boot step
commit 62da3c6a73b96d4a07e69a9b1f5519ae708817a6
Author: Michael Klishin <mklishin@pivotal.io>
Date: Mon Jul 18 11:16:21 2016 +0300
Compile
commit b656f9e96bc4a55072c2092289c52e972c44f754
Merge: f2831e1 492406e
Author: Michael Klishin <mklishin@pivotal.io>
Date: Thu Jul 14 15:25:49 2016 +0300
Merge branch 'master' into rabbitmq-server-500
commit f2831e14cd12fc242b5280326ce1cf28a1fc9766
Merge: e5858e9 7b10a4e
Author: Michael Klishin <mklishin@pivotal.io>
Date: Thu Jul 7 13:45:31 2016 +0300
Merge branch 'master' into rabbitmq-server-500
commit e5858e971825d50032e41794f68692c3d9ffa381
Author: Michael Klishin <mklishin@pivotal.io>
Date: Wed Jul 6 12:32:56 2016 +0300
Towards working connection re-registration after (inter-node) network splits
commit 548df732f17d4e30268cef4c1b2046b8c03613ef
Author: Michael Klishin <mklishin@pivotal.io>
Date: Wed Jul 6 12:32:07 2016 +0300
Make network split simulation work as expected
commit 4028c660b96b31123f3a932d17d7b8a23b08cfb6
Author: Michael Klishin <mklishin@pivotal.io>
Date: Tue Jul 5 14:43:37 2016 +0300
Close connections using rabbit_ct_client_helpers
Per discussion with @dumbbell.
commit 26fecc97aa6c4368ecc7dba4464cca8f9ea08cfa
Author: Michael Klishin <mklishin@pivotal.io>
Date: Tue Jul 5 04:17:52 2016 +0300
Extract connection limit partition tests into a separate suite
commit 8a466f1b61e3cb07ba639d5f09d260223c0ff0a4
Author: Michael Klishin <mklishin@pivotal.io>
Date: Tue Jul 5 04:17:41 2016 +0300
Better logging
commit b06de9b26ee13742290f13b32e293a990c3d5192
Author: Michael Klishin <mklishin@pivotal.io>
Date: Mon Jul 4 02:54:54 2016 +0300
Modify a test so that it (expectedly) fails
commit 078a78ae00a88566e2b7068a63457e58e149e09e
Author: Michael Klishin <mklishin@pivotal.io>
Date: Mon Jul 4 02:44:58 2016 +0300
Towards covering node termination/unavailability in connection tracking
commit ab99361041fd58371ddd0c1a76ab2a37a3c47142
Author: Michael Klishin <mklishin@pivotal.io>
Date: Sun Jul 3 15:25:10 2016 +0300
These are moved to rabbit_ct_broker_helpers
commit 520b6ef2b268e263fe4a0d33fbc578343c7ebf83
Author: Michael Klishin <mklishin@pivotal.io>
Date: Sun Jul 3 03:54:52 2016 +0300
{allow,block}_traffic_between/2 are moved to rabbit_ct_broker_helpers
commit b842eaa616d55ca813012d6afc3e3d9d85acb46f
Merge: 26eb1fa d4f031e
Author: Michael Klishin <mklishin@pivotal.io>
Date: Sun Jul 3 03:14:27 2016 +0300
Merge branch 'master' into rabbitmq-server-500
commit 26eb1fa0ede083f67f7f7177064f0274ebcd8530
Author: Michael Klishin <mklishin@pivotal.io>
Date: Sun Jul 3 02:39:09 2016 +0300
dist_proxy helpers moved to rabbit_ct_broker_helpers
commit 3d741f445be053222eaa73c973257114c17aea1c
Author: Michael Klishin <mklishin@pivotal.io>
Date: Sun Jul 3 01:28:44 2016 +0300
Cluster node shutdown test
commit 57c7129edf583120d3f20702ea68a8c2a73cf136
Author: Michael Klishin <mklishin@pivotal.io>
Date: Sat Jul 2 23:01:46 2016 +0300
Refactor
commit b736b30724828027d77a34cddf9f4bcb17b1773d
Author: Michael Klishin <mklishin@pivotal.io>
Date: Sat Jul 2 22:49:42 2016 +0300
More tests
commit dc1cb5f0797cba5840fc1fa5e98a0d688383c713
Author: Michael Klishin <mklishin@pivotal.io>
Date: Sat Jul 2 22:27:16 2016 +0300
More tests
commit e94edfed7a19add20545f40cd9dc78562546e163
Author: Michael Klishin <mklishin@pivotal.io>
Date: Sat Jul 2 17:08:34 2016 +0300
Initial per-vhost connection limit tests
commit 15b7b4e271eedea9ce02bcbbd766609fa9fe970d
Author: Michael Klishin <mklishin@pivotal.io>
Date: Sat Jul 2 15:04:57 2016 +0300
Adapt to master, compile
commit dc7f3337a8a0a268c42857becdd92640deddb1a4
Merge: e4884ff bb1fa55
Author: Michael Klishin <mklishin@pivotal.io>
Date: Sat Jul 2 02:44:18 2016 +0300
Merge branch 'master' into rabbitmq-server-500
commit e4884ffb29452fcdbd11ace1ac7b4d1b7d506b03
Merge: 71e2710 f0f43f8
Author: Michael Klishin <mklishin@pivotal.io>
Date: Wed Jun 29 14:27:40 2016 +0300
Merge branch 'master' into rabbitmq-server-500
commit 71e2710948d3a531c5426b18d63367fddf98ff55
Merge: b1ec9f3 704a2b5
Author: Michael Klishin <michael@clojurewerkz.org>
Date: Thu Mar 31 01:55:29 2016 +0300
Merge branch 'master' into rabbitmq-server-500
Conflicts:
src/rabbit_control_main.erl
src/rabbit_types.erl
commit b1ec9f30c4b896f227d3e8800d60b2934996f39e
Author: Michael Klishin <mklishin@pivotal.io>
Date: Mon Feb 15 13:51:37 2016 +0300
Stub out event handlers for #627 and #628
commit f3cfb57e2e83436e51d7d065edd04cc9197b6539
Author: Michael Klishin <michael@clojurewerkz.org>
Date: Sat Feb 13 01:33:50 2016 +0300
Use a counter column to track number of connections per vhost
Limit query time is now 50-70 microseconds for
50M connections.
commit e9132f11253972ff6b0cc09529e9cd39ba67c140
Author: Michael Klishin <michael@clojurewerkz.org>
Date: Fri Feb 12 06:23:51 2016 +0300
Ignore ./debug
commit 976e3ae10ba7e81c3ead1d2bd1fc852b0f9e3004
Author: Michael Klishin <michael@clojurewerkz.org>
Date: Fri Feb 12 06:20:01 2016 +0300
Switch to ets:select_count/2
commit ec23cf15ad840da46c321e965081815173989197
Author: Michael Klishin <michael@clojurewerkz.org>
Date: Thu Feb 11 05:11:08 2016 +0300
Enforce max connection limit
Also introduce `rabbitmqctl clear_vhost_limits`
and fix rabbitmqctl(1).
commit ba20887832170f9c9b88e19cad06e0995f887b5b
Merge: 49a1886 8974581
Author: Michael Klishin <michael@clojurewerkz.org>
Date: Thu Feb 11 02:16:24 2016 +0300
Merge branch 'master' into rabbitmq-server-500
commit 49a18867faf6e38c08ad12635e716d7ff53b0529
Author: Michael Klishin <michael@clojurewerkz.org>
Date: Wed Feb 10 16:45:00 2016 +0300
Spelling
commit 723e6e4e412b81e47f3a9db5451a1342debcf79e
Author: Michael Klishin <michael@clojurewerkz.org>
Date: Wed Feb 10 16:31:34 2016 +0300
Create secondary indices on rabbit_tracked_connection.vhost and username
commit b468c0fa05ce51cebff19098b500ccc217542f9f
Merge: 6940d05 0120438
Author: Michael Klishin <michael@clojurewerkz.org>
Date: Wed Feb 10 12:23:38 2016 +0300
Merge branch 'master' into rabbitmq-server-500
commit 6940d059cf3f844b2aab9cfe00652f23f9a6ad06
Author: Michael Klishin <michael@clojurewerkz.org>
Date: Mon Feb 8 01:30:03 2016 +0300
Spam
commit 032c2a67f59889dbec6a3ca6c5af23920a0d7cb2
Merge: 46da39c 2374ae8
Author: Michael Klishin <michael@clojurewerkz.org>
Date: Fri Feb 5 23:48:38 2016 +0300
Merge branch 'master' into rabbitmq-server-500
commit 46da39c5f5e801939a61b476e577636d30eb6e54
Merge: 655e351 05361e6
Author: Michael Klishin <michael@clojurewerkz.org>
Date: Wed Feb 3 11:20:08 2016 +0300
Merge branch 'master' into rabbitmq-server-500
commit 655e3512a031c5f57c8c09c5432a5d7671acc6af
Author: Michael Klishin <michael@clojurewerkz.org>
Date: Wed Feb 3 11:19:23 2016 +0300
Store and delete tracked connections in a table
commit 4e849cf936f414a11bf5da3135e7a79c75413642
Author: Michael Klishin <michael@clojurewerkz.org>
Date: Tue Jan 19 17:56:14 2016 +0300
Compile
commit 504adde27cfbdb4f81ddd0e4e25abda23b5f138e
Author: Michael Klishin <michael@clojurewerkz.org>
Date: Tue Jan 19 17:55:08 2016 +0300
Switch to a handler for connection tracking (WIP)
commit 3e1d2b4f65608e2c853ad7be0580050ee38fa4e7
Author: Michael Klishin <michael@clojurewerkz.org>
Date: Tue Jan 19 14:46:09 2016 +0300
Migrations for virtual host limits and tracked connections
commit 7499020af6fa8f2685cbee37ad77f189af6ee1e6
Author: Michael Klishin <michael@clojurewerkz.org>
Date: Fri Jan 8 19:40:36 2016 +0300
Compile
commit f3a11012f05d64d6d62fd5ec45a38fafaef47c49
Author: Michael Klishin <michael@clojurewerkz.org>
Date: Fri Jan 8 19:14:12 2016 +0300
Switch rabbitmqctl set_vhost_limits to use JSON payload values
Just like policies do.
commit 7fc5f1a074ab5a34c33792a8ba25aa107eb0d993
Author: Michael Klishin <michael@clojurewerkz.org>
Date: Wed Jan 6 19:07:50 2016 +0300
Stub out set_vhost_limits in ctl
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit_cli.hrl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/rabbit_cli.hrl b/include/rabbit_cli.hrl index a0d1ecfdd5..0e338855cd 100644 --- a/include/rabbit_cli.hrl +++ b/include/rabbit_cli.hrl @@ -30,7 +30,6 @@ -define(OFFLINE_OPT, "--offline"). -define(ONLINE_OPT, "--online"). - -define(NODE_DEF(Node), {?NODE_OPT, {option, Node}}). -define(QUIET_DEF, {?QUIET_OPT, flag}). -define(VHOST_DEF, {?VHOST_OPT, {option, "/"}}). |
