Skip to content
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

[Backport 2024.1] improvement(logcollector): collect schema info #9405

Merged
merged 1 commit into from
Dec 8, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 28, 2024

Collect schema and system_schema.tables info and save it on the runner. Add the new logs to the node logs archive.

Task: https://github.com/scylladb/qa-tasks/issues/1813

Testing

PR pre-checks (self review)

  • I added the relevant backport labels
  • I didn't leave commented-out/debugging code

Reminders

  • Add New configuration option and document them (in sdcm/sct_config.py)
  • Add unit tests to cover my changes (under unit-test/ folder)
  • Update the Readme/doc folder relevant to this change (if needed)

(cherry picked from commit d8c275f)

Parent PR: #9329

@mergify mergify bot added the conflicts label Nov 28, 2024
Copy link
Author

mergify bot commented Nov 28, 2024

Cherry-pick of d8c275f has failed:

On branch mergify/bp/branch-2024.1/pr-9329
Your branch is up to date with 'origin/branch-2024.1'.

You are currently cherry-picking commit d8c275fc8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   sdcm/cluster.py
	modified:   unit_tests/test_tester.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   sdcm/logcollector.py
	both modified:   sdcm/tester.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot marked this pull request as draft November 28, 2024 07:55
@fruch
Copy link
Contributor

fruch commented Nov 28, 2024

@juliayakovlev can you handle those conflicts ?

@fruch
Copy link
Contributor

fruch commented Dec 2, 2024

@juliayakovlev can you handle those conflicts ?

@juliayakovlev, please attend to this one

@juliayakovlev juliayakovlev force-pushed the mergify/bp/branch-2024.1/pr-9329 branch from b3d74e2 to e88706d Compare December 8, 2024 12:28
Collect schema and system_schema.tables info and save it on the
runner. Add the new logs to the node logs archive

(cherry picked from commit d8c275f)

# Conflicts:
#	sdcm/logcollector.py
#	sdcm/tester.py
@juliayakovlev juliayakovlev force-pushed the mergify/bp/branch-2024.1/pr-9329 branch from e88706d to cbe1cd2 Compare December 8, 2024 12:57
@juliayakovlev
Copy link
Contributor

@fruch conflicts solved

@fruch fruch marked this pull request as ready for review December 8, 2024 20:30
@fruch fruch removed the conflicts label Dec 8, 2024
@fruch fruch merged commit 03b5f20 into branch-2024.1 Dec 8, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants