Skip to content
This repository has been archived by the owner on Nov 17, 2020. It is now read-only.

Keep track of connections, introduce per-vhost limits #121

Merged
merged 9 commits into from
Aug 26, 2016
Merged

Keep track of connections, introduce per-vhost limits #121

merged 9 commits into from
Aug 26, 2016

Conversation

michaelklishin
Copy link
Member

@michaelklishin
Keep track of connections, introduce per-vhost limits
59d8c33 
Part of rabbitmq/rabbitmq-server#500.

Squashed commit of the following:

commit 2f0a08d
Author: Michael Klishin <[email protected]>
Date:   Thu Jul 21 03:20:07 2016 +0300

    Name is already a binary

commit 0678f00
Merge: f16db88 b3468c5
Author: Michael Klishin <[email protected]>
Date:   Thu Jul 21 03:06:02 2016 +0300

    Merge branch 'master' into rabbitmq-server-500

commit f16db88
Author: Michael Klishin <[email protected]>
Date:   Wed Jul 20 18:30:13 2016 +0300

    Missing file from earlier commit

commit f284cf9
Merge: 6998e6a 3aa3e93
Author: Michael Klishin <[email protected]>
Date:   Wed Jul 20 18:29:57 2016 +0300

    Merge branch 'master' into rabbitmq-server-500

commit 6998e6a
Author: Michael Klishin <[email protected]>
Date:   Mon Jul 18 11:15:19 2016 +0300

    Move connection record to rabbit.hrl

    So that it can be used outside of rabbit_reader.

commit 1f1f6a1
Merge: d35bb6e 2f3d2b4
Author: Michael Klishin <[email protected]>
Date:   Thu Jul 14 15:26:03 2016 +0300

    Merge branch 'master' into rabbitmq-server-500

commit d35bb6e
Merge: 26bff83 bd25b0e
Author: Michael Klishin <[email protected]>
Date:   Thu Jul 7 13:45:17 2016 +0300

    Merge branch 'master' into rabbitmq-server-500

commit 26bff83
Author: Michael Klishin <[email protected]>
Date:   Wed Jul 6 12:31:47 2016 +0300

    Connection re-registration after network split WIP

commit 9cc96f0
Author: Michael Klishin <[email protected]>
Date:   Sun Jul 3 15:25:15 2016 +0300

    Move set_partition_handling_mode_globally/2 and set_partition_handling_mode/3 to broker helpers

commit 5997e06
Author: Michael Klishin <[email protected]>
Date:   Sun Jul 3 03:54:02 2016 +0300

    Move block_traffic_between/2, allow_traffic_between/2 from partition_SUITE

commit c9bb2d2
Merge: 1395888 b518e99
Author: Michael Klishin <[email protected]>
Date:   Sun Jul 3 03:14:36 2016 +0300

    Merge branch 'master' into rabbitmq-server-500

commit 1395888
Author: Michael Klishin <[email protected]>
Date:   Sun Jul 3 02:38:51 2016 +0300

    Move dist_proxy helpers from partitions_SUITE

commit af11e9e
Author: Michael Klishin <[email protected]>
Date:   Sat Jul 2 22:27:39 2016 +0300

    Test helpers for managing permissions

commit e56b20c
Author: Michael Klishin <[email protected]>
Date:   Sat Jul 2 17:28:01 2016 +0300

    Missing exports

commit 7a458e1
Author: Michael Klishin <[email protected]>
Date:   Sat Jul 2 17:26:07 2016 +0300

    Introduce rabbit_ct_broker_helpers:{add,delete}_vhost/2

commit 6bbcaa2
Author: Michael Klishin <[email protected]>
Date:   Sat Jul 2 15:02:09 2016 +0300

    Export tracked_connection/0

commit 6381608
Merge: c082ad9 a5d1a4f
Author: Michael Klishin <[email protected]>
Date:   Sat Jul 2 02:44:05 2016 +0300

    Merge branch 'master' into rabbitmq-server-500

commit c082ad9
Merge: 0ba62eb f846d9c
Author: Michael Klishin <[email protected]>
Date:   Wed Jun 29 14:26:53 2016 +0300

    Merge branch 'master' into rabbitmq-server-500

commit 0ba62eb
Author: Michael Klishin <[email protected]>
Date:   Thu Mar 31 01:53:36 2016 +0300

    Move new types from rabbitmq-server

commit d4a9eca
Merge: b78d3d2 11233ff
Author: Michael Klishin <[email protected]>
Date:   Thu Mar 31 01:50:45 2016 +0300

    Merge branch 'master' into rabbitmq-server-500

commit b78d3d2
Author: Michael Klishin <[email protected]>
Date:   Thu Feb 18 17:08:33 2016 +0300

    Enforce per-vhost connection limit

commit 7e34dca
Merge: c7f941d dff2b14
Author: Michael Klishin <[email protected]>
Date:   Wed Feb 10 12:23:43 2016 +0300

    Merge branch 'master' into rabbitmq-server-500

commit c7f941d
Merge: 827b854 3da8ad8
Author: Michael Klishin <[email protected]>
Date:   Fri Feb 5 23:48:31 2016 +0300

    Merge branch 'master' into rabbitmq-server-500

commit 827b854
Merge: 9720d12 56c8d46
Author: Michael Klishin <[email protected]>
Date:   Wed Feb 3 11:20:21 2016 +0300

    Merge branch 'master' into rabbitmq-server-500

commit 9720d12
Author: Michael Klishin <[email protected]>
Date:   Wed Feb 3 11:19:01 2016 +0300

    Track connection node and username

commit 7375646
Author: Michael Klishin <[email protected]>
Date:   Tue Jan 19 18:14:28 2016 +0300

    Include connection name into connection_closed events

commit d1f96c4
Author: Michael Klishin <[email protected]>
Date:   Tue Jan 19 17:53:35 2016 +0300

    Add protocol to tracked_connection

commit 56db86a
Author: Michael Klishin <[email protected]>
Date:   Tue Jan 19 14:45:26 2016 +0300

    Introduce tracked_connection

commit 0f765dc
Author: Michael Klishin <[email protected]>
Date:   Fri Jan 8 19:13:23 2016 +0300

    Change second vhost record field to be limits
@michaelklishin michaelklishin added this to the n/a milestone Jul 22, 2016
@michaelklishin michaelklishin mentioned this pull request Jul 22, 2016
Merged
@michaelklishin michaelklishin changed the title Keep track of connections, introduce per-vhost limits DO NOT MERGE Keep track of connections, introduce per-vhost limits Jul 22, 2016
dumbbell
dumbbell reviewed Jul 25, 2016
View reviewed changes
src/rabbit_ct_broker_helpers.erl
rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_vhost, add, [VHost]).

delete_vhost(Config, VHost) ->
rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_vhost, delete, [VHost]).
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please not hard-code the node and take it as an argument instead?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can introduce a new function head but since vhost and user operations are cluster-wide, would they be used often?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nodes may not be clustered. As this is the responsability of the testcase, I would indicate the node in the test, not in rabbit_ct_broker_helpers.erl.

@michaelklishin michaelklishin changed the title DO NOT MERGE Keep track of connections, introduce per-vhost limits Keep track of connections, introduce per-vhost limits Aug 8, 2016
@michaelklishin michaelklishin changed the title Keep track of connections, introduce per-vhost limits DO NOT MERGE Keep track of connections, introduce per-vhost limits Aug 12, 2016
@michaelklishin michaelklishin changed the title DO NOT MERGE Keep track of connections, introduce per-vhost limits Keep track of connections, introduce per-vhost limits Aug 12, 2016
michaelklishin and others added 2 commits August 24, 2016 17:11
@michaelklishin
Merge branch 'master' into rabbitmq-server-500-squashed
597478c
@dumbbell
rabbit_ct_broker_helpers: Rename NodeIndex to Node
4f067fd 
... because a nodename is a valid argument too.

References #500.
[#116521809]
@michaelklishin michaelklishin merged commit 8b975b1 into master Aug 26, 2016
@dumbbell dumbbell deleted the rabbitmq-server-500-squashed branch November 3, 2017 10:31
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@dumbbell dumbbell

Labels
None yet
Projects
None yet
Milestone
n/a
Development

Successfully merging this pull request may close these issues.
2 participants
@michaelklishin @dumbbell