diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-03-01 22:56:13 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-03-01 22:56:13 +0300 |
| commit | aa67e54d6b644444c921a547b1e93d0e86dbcce0 (patch) | |
| tree | f1d53c8f54e998449fd03ae19bbaf056b2207f43 /src | |
| parent | 30d738accc42bc411ce4597e397e07ad761bf1ee (diff) | |
| download | rabbitmq-server-git-aa67e54d6b644444c921a547b1e93d0e86dbcce0.tar.gz | |
Revert "Update metrics gc to support gc marker"
This reverts commit bde71d2c49632d25a235edb86aa56efaf760fb97.
This was not meant to be merged directly into master. Other
repositories need a manual merge.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_core_metrics_gc.erl | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/rabbit_core_metrics_gc.erl b/src/rabbit_core_metrics_gc.erl index e0d7781796..e7f848bbc3 100644 --- a/src/rabbit_core_metrics_gc.erl +++ b/src/rabbit_core_metrics_gc.erl @@ -96,8 +96,6 @@ gc_gen_server2() -> gc_process(Table) -> ets:foldl(fun({Pid = Key, _}, none) -> gc_process(Pid, Table, Key); - ({Pid = Key, _, _, _, _}, none) -> - gc_process(Pid, Table, Key); ({Pid = Key, _, _, _}, none) -> gc_process(Pid, Table, Key) end, none, Table). @@ -117,8 +115,6 @@ gc_entity(Table, GbSet) -> gc_entity(Id, Table, Key, GbSet); ({Id = Key, _}, none) -> gc_entity(Id, Table, Key, GbSet); - ({Id = Key, _, _}, none) -> - gc_entity(Id, Table, Key, GbSet); ({Id = Key, _, _, _, _}, none) -> gc_entity(Id, Table, Key, GbSet) end, none, Table). @@ -134,11 +130,11 @@ gc_entity(Id, Table, Key, GbSet) -> end. gc_process_and_entity(Table, GbSet) -> - ets:foldl(fun({{Pid, Id} = Key, _, _, _, _, _, _, _}, none) + ets:foldl(fun({{Pid, Id} = Key, _, _, _, _, _, _}, none) when Table == channel_queue_metrics -> gc_entity(Id, Table, Key, GbSet), gc_process(Pid, Table, Key); - ({{Pid, Id} = Key, _, _, _, _}, none) + ({{Pid, Id} = Key, _, _, _}, none) when Table == channel_exchange_metrics -> gc_entity(Id, Table, Key, GbSet), gc_process(Pid, Table, Key); @@ -161,7 +157,7 @@ gc_process_and_entity(Id, Pid, Table, Key, GbSet) -> end. gc_process_and_entities(Table, QueueGbSet, ExchangeGbSet) -> - ets:foldl(fun({{Pid, {Q, X}} = Key, _, _}, none) -> + ets:foldl(fun({{Pid, {Q, X}} = Key, _}, none) -> gc_process(Pid, Table, Key), gc_entity(Q, Table, Key, QueueGbSet), gc_entity(X, Table, Key, ExchangeGbSet) |