root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #12437 from rabbitmq/rabbitmq-server-12422 

By @ayanda-D: make sure (non-replicated) CQs (classic queues) emit leader and members metrics, just like replicated QQs
This commit is contained in:
Michael Klishin 2024-10-03 01:52:02 -04:00 committed by GitHub
parent 537fe75483 232798c12a
commit bc1e0ad2ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/templates/test-mixed-versions.template.yaml vendored
View File

@ -96,7 +96,7 @@ jobs:
https://builds.hex.pm https://builds.hex.pm
https://cdn.jsdelivr.net/hex https://cdn.jsdelivr.net/hex
- name: AUTHENTICATE TO GOOGLE CLOUD - name: AUTHENTICATE TO GOOGLE CLOUD
uses: google-github-actions/auth@v2.1.5 uses: google-github-actions/auth@v2.1.6
with: with:
credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }} credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
- name: BUILD SECONDARY UMBRELLA ARCHIVE - name: BUILD SECONDARY UMBRELLA ARCHIVE

2
.github/workflows/templates/test.template.yaml vendored
View File

@ -73,7 +73,7 @@ jobs:
run: | run: |
echo "value=bazel-repo-cache-${{ hashFiles('MODULE.bazel') }}" | tee -a $GITHUB_OUTPUT echo "value=bazel-repo-cache-${{ hashFiles('MODULE.bazel') }}" | tee -a $GITHUB_OUTPUT
- name: AUTHENTICATE TO GOOGLE CLOUD - name: AUTHENTICATE TO GOOGLE CLOUD
uses: google-github-actions/auth@v2.1.5 uses: google-github-actions/auth@v2.1.6
with: with:
credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }} credentials_json: ${{ secrets.REMOTE_CACHE_CREDENTIALS_JSON }}
- name: REPO CACHE - name: REPO CACHE

6
deps/rabbit/src/rabbit_amqqueue_process.erl vendored
View File

@ -119,7 +119,9 @@
arguments, arguments,
owner_pid, owner_pid,
exclusive, exclusive,
user_who_performed_action user_who_performed_action,
leader,
members
]). ]).
-define(INFO_KEYS, [pid | ?CREATION_EVENT_KEYS ++ ?STATISTICS_KEYS -- [name, type]]). -define(INFO_KEYS, [pid | ?CREATION_EVENT_KEYS ++ ?STATISTICS_KEYS -- [name, type]]).
@ -1083,6 +1085,8 @@ i(auto_delete, #q{q = Q}) -> amqqueue:is_auto_delete(Q);
i(arguments, #q{q = Q}) -> amqqueue:get_arguments(Q); i(arguments, #q{q = Q}) -> amqqueue:get_arguments(Q);
i(pid, _) -> i(pid, _) ->
self(); self();
i(leader, State) -> node(i(pid, State));
i(members, State) -> [i(leader, State)];
i(owner_pid, #q{q = Q}) when ?amqqueue_exclusive_owner_is(Q, none) -> i(owner_pid, #q{q = Q}) when ?amqqueue_exclusive_owner_is(Q, none) ->
''; '';
i(owner_pid, #q{q = Q}) -> i(owner_pid, #q{q = Q}) ->