integration test: fix test case "br_pitr" #58876

3pointer · 2025-01-13T06:30:59Z

Issue Number: ref #58430

What problem does this PR solve?

Problem Summary:
The previous cherry-pick PR(#58527) has merge conflict on br_pitr test case. This PR fixed it.

What changed and how does it work?

Check List

Tests

Unit test
Integration test
Manual test (add detailed scripts or steps below)
No need to test
- I checked and no code files have been changed.

Side effects

Performance regression: Consumes more CPU
Performance regression: Consumes more Memory
Breaking backward compatibility

Documentation

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

ti-chi-bot · 2025-01-13T06:31:02Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

tiprow · 2025-01-13T06:31:16Z

Hi @3pointer. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

3pointer · 2025-01-13T06:31:19Z

/ok-to-test

3pointer · 2025-01-13T06:32:03Z

/test pull-br-integration-test

tiprow · 2025-01-13T06:32:24Z

@3pointer: No presubmit jobs available for pingcap/[email protected]

In response to this:

/test pull-br-integration-test

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

codecov · 2025-01-13T06:44:52Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (release-8.5@f0db14c). Learn more about missing BASE report.

Additional details and impacted files

@@               Coverage Diff                @@
##             release-8.5     #58876   +/-   ##
================================================
  Coverage               ?   57.5397%           
================================================
  Files                  ?       1770           
  Lines                  ?     627441           
  Branches               ?          0           
================================================
  Hits                   ?     361028           
  Misses                 ?     241889           
  Partials               ?      24524

Flag	Coverage Δ
integration	`38.0220% <ø> (?)`
unit	`72.6770% <ø> (?)`

Flags with carried forward coverage won't be shown. Click here to find out more.

Components	Coverage Δ
dumpling	`52.8711% <0.0000%> (?)`
parser	`∅ <0.0000%> (?)`
br	`63.0566% <0.0000%> (?)`

ti-chi-bot · 2025-01-13T08:26:52Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BornChanger, YuJuncen

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~br/OWNERS~~ [BornChanger,YuJuncen]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

ti-chi-bot · 2025-01-13T08:26:59Z

[LGTM Timeline notifier]

Timeline:

2025-01-13 08:19:13.289358099 +0000 UTC m=+773696.578189804: ☑️ agreed by YuJuncen.
2025-01-13 08:26:58.037577448 +0000 UTC m=+774161.326409153: ☑️ agreed by BornChanger.

BornChanger · 2025-01-13T08:29:04Z

br/tests/br_pitr/run.sh

@@ -112,12 +112,7 @@ fi
 # PITR restore
 echo "run pitr"
 run_sql "DROP DATABASE __TiDB_BR_Temporary_Log_Restore_Checkpoint;"
-<<<<<<< HEAD
 run_br --pd $PD_ADDR restore point -s "local://$TEST_DIR/$PREFIX/log" --full-backup-storage "local://$TEST_DIR/$PREFIX/full" > $res_file 2>&1


Suggested change

run_br --pd $PD_ADDR restore point -s "local://$TEST_DIR/$PREFIX/log" --full-backup-storage "local://$TEST_DIR/$PREFIX/full" > $res_file 2>&1

run_br --pd $PD_ADDR restore point -s "local://$TEST_DIR/$PREFIX/log" --full-backup-storage "local://$TEST_DIR/$PREFIX/full" > $res_file 2>&1 || ( cat $res_file && exit 1 )

BornChanger · 2025-01-13T08:29:22Z

/hold

…_pr=95 * executor: fix a bug that global temporary table send cop request (pingcap#588… * statistics: fix the panic when to async load stats with dropped index … * executor: fix prepared protocol charset (pingcap#58872) (pingcap#58931) * *: Update client-go and verify all read ts (pingcap#58909) * integration test: fix test case "br_pitr" (pingcap#58876) * session: add indexes for `mysql.analyze_jobs` (pingcap#58134) (pingcap#58355) * ddl: fix args count for modify column (pingcap#58855) (pingcap#58858) * planner: correct plan when scan tidb related cluster table with KeepOr… * planner: Fix vector not truncated after CBO (pingcap#58809) (pingcap#58844) * ddl: Fix vector index for high dimensional vectors (pingcap#58717) (pingcap#58835) * ddl: Fix issue with concurrent update getting reverted by BackfillData… * statistics: stats cache set default quota as 20% (pingcap#58013) (pingcap#58817) * executor: change the evaluation order of columns in `Update` and `Inse… * statistics: add recover to protect background task (pingcap#58739) (pingcap#58767) * ttl: fix the infinite waiting for delRateLimiter when `tidb_ttl_delete… * ttl: reduce some warnings logs when locking TTL tasks (pingcap#58306) (pingcap#58783) * ttl: retry the rows when del rate limiter returns error in delWorker (… * ttl: reschedule task to other instances when shrinking worker (pingcap#57703) (pingcap#58778) * ttl: fix the issue that one task losing heartbeat will block other tas… * ttl: fix the issue that the task is not cancelled after transfering ow… * ddl: fix job state overridden when concurrent updates don't overlap in… * ttl: set the job history status to `cancelled` if it's removed in GC a… * ttl: fix the timezone issue and panic in the caller of `getSession` (#… * ddl: fix version syncer doesn't print who hasn't synced on partial syn… * ttl: fix the issue that `DROP TABLE` / `ALTER TABLE` will keep job run… * br/stream: allow pitr to create oversized indices (pingcap#58433) (pingcap#58527) * ttl: set a result for timeout scan task during shrinking scan worker (… * executor: fix time zone issue when querying slow log (pingcap#58455) (pingcap#58577) * table: fix the issue that the default value for `BIT` column is wrong … * statistics: temporarily skip handling errors for DDL events (pingcap#58609) (pingcap#58634) * sessionctx: fix null max value to leading wrong warning (pingcap#57898) (pingcap#57935) * planner: convert cartesian semi join with other nulleq condition to cr… * planner: fix idxMergePartPlans forget to deal with RootTaskConds (pingcap#585… * domain: change some stats log level as WARN (pingcap#58316) (pingcap#58555) * planner: quickly get total count from index/column (pingcap#58365) (pingcap#58431) * planner, expr: eval readonly user var during plan phase (pingcap#54462) (pingcap#58540) * metrics: add col/idx name(s) for BackfillProgressGauge and BackfillTot… * br: refactor test to use wait checkpoint method (pingcap#57612) (pingcap#58498) * executor: reuse chunk in hash join v2 during restoring (pingcap#56936) (pingcap#58018) * executor: fix goroutine leak when exceed quota in hash agg (pingcap#58078) (pingcap#58462) * copr: fix the issue that busy threshold may redirect batch copr to fol… * statistics: skip non-exicted table when to init stats (pingcap#58381) (pingcap#58394) * planner: fix incorrectly using the schema for plan cache (pingcap#57964) (pingcap#58090) * *: use DDL subscriber updating stats meta (pingcap#57872) (pingcap#58387) * planner, runtime_filter: Remove redundant logs whose meaning can be di… * statistics: remove dead code (pingcap#58412) (pingcap#58442) * planner: Use/force to apply prefer range scan (pingcap#56928) (pingcap#58444) * statistics: gc the statistics correctly after drop the database (pingcap#5730… * ddl: Fixed partition interval from DayMinute to just Minute. (pingcap#57738) (pingcap#58019) * executor: Enlarge the timeout for fetching TiFlash system tables (pingcap#579…

fix test

7108f53

ti-chi-bot bot added the ok-to-test Indicates a PR is ready to be tested. label Jan 13, 2025

3pointer added the skip-issue-check Indicates that a PR no need to check linked issue. label Jan 13, 2025

3pointer marked this pull request as ready for review January 13, 2025 07:32

ti-chi-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 13, 2025

3pointer changed the title ~~integration test: fix test br_pitr~~ integration test: fix test case "br_pitr" Jan 13, 2025

YuJuncen approved these changes Jan 13, 2025

View reviewed changes

ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jan 13, 2025

BornChanger approved these changes Jan 13, 2025

View reviewed changes

ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jan 13, 2025

BornChanger reviewed Jan 13, 2025

View reviewed changes

ti-chi-bot bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 13, 2025

ti-chi-bot bot merged commit 722347b into pingcap:release-8.5 Jan 13, 2025
19 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

integration test: fix test case "br_pitr" #58876

integration test: fix test case "br_pitr" #58876

Uh oh!

3pointer commented Jan 13, 2025 •

edited by YuJuncen

Loading

Uh oh!

ti-chi-bot bot commented Jan 13, 2025

Uh oh!

tiprow bot commented Jan 13, 2025

Uh oh!

3pointer commented Jan 13, 2025

Uh oh!

3pointer commented Jan 13, 2025

Uh oh!

tiprow bot commented Jan 13, 2025

Uh oh!

codecov bot commented Jan 13, 2025 •

edited

Loading

Uh oh!

ti-chi-bot bot commented Jan 13, 2025

Uh oh!

ti-chi-bot bot commented Jan 13, 2025

Uh oh!

BornChanger Jan 13, 2025

Uh oh!

BornChanger commented Jan 13, 2025

Uh oh!

Uh oh!

Uh oh!

	run_br --pd $PD_ADDR restore point -s "local://$TEST_DIR/$PREFIX/log" --full-backup-storage "local://$TEST_DIR/$PREFIX/full" > $res_file 2>&1
	run_br --pd $PD_ADDR restore point -s "local://$TEST_DIR/$PREFIX/log" --full-backup-storage "local://$TEST_DIR/$PREFIX/full" > $res_file 2>&1 \|\| ( cat $res_file && exit 1 )

integration test: fix test case "br_pitr" #58876

integration test: fix test case "br_pitr" #58876

Uh oh!

Conversation

3pointer commented Jan 13, 2025 • edited by YuJuncen Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What problem does this PR solve?

What changed and how does it work?

Check List

Release note

Uh oh!

ti-chi-bot bot commented Jan 13, 2025

Uh oh!

tiprow bot commented Jan 13, 2025

Uh oh!

3pointer commented Jan 13, 2025

Uh oh!

3pointer commented Jan 13, 2025

Uh oh!

tiprow bot commented Jan 13, 2025

Uh oh!

codecov bot commented Jan 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

ti-chi-bot bot commented Jan 13, 2025

Uh oh!

ti-chi-bot bot commented Jan 13, 2025

[LGTM Timeline notifier]

Uh oh!

BornChanger Jan 13, 2025

Choose a reason for hiding this comment

Uh oh!

BornChanger commented Jan 13, 2025

Uh oh!

Uh oh!

Uh oh!

3pointer commented Jan 13, 2025 •

edited by YuJuncen

Loading

codecov bot commented Jan 13, 2025 •

edited

Loading