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

tz (ticdc): fix timezone error #3887

Merged
merged 3 commits into from
Dec 16, 2021
Merged

Conversation

asddongmen
Copy link
Contributor

@asddongmen asddongmen commented Dec 15, 2021

What problem does this PR solve?

close #3584

What is changed and how it works?

Check List

Tests

  • Manual test (add detailed scripts or steps below)
    image
    There are some error log, but cdc server run successfully.
    Code changes

Side effects

Related changes

  • Need to cherry-pick to the release branch

Release note

Fix timezone related error that cause cdc server can't run in some RHEL release version (6.8, 6.9 etc).

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 15, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • amyangfei
  • overvenus

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 15, 2021
@codecov-commenter
Copy link

codecov-commenter commented Dec 15, 2021

Codecov Report

Merging #3887 (d8c2704) into master (3873d39) will decrease coverage by 1.9687%.
The diff coverage is 44.1527%.

Flag Coverage Δ
cdc 57.9852% <25.4902%> (-0.2513%) ⬇️
dm 52.6902% <46.7391%> (-3.3444%) ⬇️

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

@@               Coverage Diff                @@
##             master      #3887        +/-   ##
================================================
- Coverage   57.0741%   55.1053%   -1.9688%     
================================================
  Files           478        481         +3     
  Lines         56551      58742      +2191     
================================================
+ Hits          32276      32370        +94     
- Misses        20978      23093      +2115     
+ Partials       3297       3279        -18     

@asddongmen
Copy link
Contributor Author

/run-integration-tests

@asddongmen asddongmen added needs-cherry-pick-release-4.0 Should cherry pick this PR to release-4.0 branch. needs-cherry-pick-release-5.0 Should cherry pick this PR to release-5.0 branch. needs-cherry-pick-release-5.1 Should cherry pick this PR to release-5.1 branch. needs-cherry-pick-release-5.2 Should cherry pick this PR to release-5.2 branch. needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. labels Dec 15, 2021
Copy link
Member

@overvenus overvenus left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 15, 2021
@asddongmen asddongmen added the type/bugfix This PR fixes a bug. label Dec 15, 2021
if err != nil {
return nil, cerror.WrapError(cerror.ErrLoadTimezone, err)
}
str := timeutil.InferSystemTZ()
return getTimezoneFromZonefile(str)
Copy link
Contributor

@amyangfei amyangfei Dec 16, 2021

Choose a reason for hiding this comment

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

Seems getTimezoneFromZonefile can be simplified after we use infer system tz. Can file an issue and do it in another PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Dec 16, 2021
@amyangfei
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: d8c2704

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 16, 2021
@ti-chi-bot
Copy link
Member

@asddongmen: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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 ti-community-infra/tichi repository.

@asddongmen
Copy link
Contributor Author

/run-leak-tests
/run-dm-integration-tests

@ti-chi-bot ti-chi-bot merged commit 71e2a48 into pingcap:master Dec 16, 2021
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #3906.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #3907.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #3908.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #3909.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #3910.

3AceShowHand pushed a commit to ti-chi-bot/tiflow that referenced this pull request Dec 25, 2021
zhaoxinyu pushed a commit to zhaoxinyu/ticdc that referenced this pull request Dec 29, 2021
3AceShowHand pushed a commit to ti-chi-bot/tiflow that referenced this pull request Jan 13, 2022
3AceShowHand pushed a commit to ti-chi-bot/tiflow that referenced this pull request Jan 13, 2022
overvenus pushed a commit that referenced this pull request Jan 18, 2022
* fix the txn_batch_size metric inaccuracy bug when the sink target is MQ

* address comments

* add comments for exported functions

* fix the compiling problem

* workerpool: limit the rate to output deadlock warning (#3775) (#3799)

* metrics: add changefeed checkepoint catch-up ETA (#3300) (#3311)

* pkg,cdc: do not use log package (#3902) (#3939)

* *: rename repo from pingcap/ticdc to pingcap/tiflow (#3957)

* kvclient(ticdc): fix kvclient takes too long time to recover (#3612) (#3662)

* tz (ticdc): fix timezone error (#3887) (#3910)

* http_*: add log for http api and refine the err handle logic (#2997) (#3306)

* ticdc/alert: add no owner alert rule (#3809) (#3831)

* etcd_worker: batch etcd patch (#3277) (#3393)

* ticdc/owner: Fix ddl special comment syntax error (#3845) (#3977)

* Clean old owner and old processor in release 5.2 branch (#4019)

* tests(ticdc): set up the sync diff output directory correctly (#3725) (#3745)

* owner,scheduler(cdc): fix nil pointer panic in owner scheduler (#2980) (#4007) (#4015)

* config(ticdc): Fix old value configuration check for maxwell protocol (#3747) (#3782)

* ticdc/processor: Fix backoff base delay misconfiguration (#3992) (#4027)

* sink(ticdc): cherry pick sink bug fix to release 5.2 (#4083) (#4119)

* metrics(ticdc): add resolved ts and add changefeed to dataflow (#4038) (#4103)

* kv(ticdc): reduce eventfeed rate limited log (#4072) (#4110)

close #4006

* This is an automated cherry-pick of #4192

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

* http_api (ticdc): fix http api 'get processor' panic. (#4117) (#4122)

close #3840

* cdc/sink: adjust kafka initialization logic (#3192) (#3568)

* This is an automated cherry-pick of #3192

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

* fix conflicts.

* This is an automated cherry-pick of #3682

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

* fix import.

* fix failpoint path.

* try to fix initialize.

* remove table_sink.

* remove initialization.

* remove owner.

* fix mq.

Co-authored-by: Ling Jin <7138436+3AceShowHand@users.noreply.github.com>
Co-authored-by: 3AceShowHand <jinl1037@hotmail.com>

* sink (ticdc): fix a deadlock due to checkpointTs fall back in sinkNode (#4084) (#4098)

close #4055

* This is an automated cherry-pick of #4192

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

* fix conflicts.

* fix conflicts.

* fix conflicts.

Co-authored-by: zhaoxinyu <zhaoxinyu512@gmail.com>
Co-authored-by: amyangfei <yangfei@pingcap.com>
Co-authored-by: dongmen <20351731+asddongmen@users.noreply.github.com>
Co-authored-by: Ling Jin <7138436+3AceShowHand@users.noreply.github.com>
Co-authored-by: 3AceShowHand <jinl1037@hotmail.com>
overvenus pushed a commit that referenced this pull request Jan 18, 2022
* fix the txn_batch_size metric inaccuracy bug when the sink target is MQ

* address comments

* add comments for exported functions

* fix the compiling problem

* workerpool: limit the rate to output deadlock warning (#3775) (#3795)

* tests(ticdc): set up the sync diff output directory correctly (#3725) (#3741)

* relay(dm): use binlog name comparison (#3710) (#3712)

* dm/load: fix concurrent call Loader.Status (#3459) (#3468)

* cdc/sorter: make unified sorter cgroup aware (#3436) (#3439)

* tz (ticdc): fix timezone error (#3887) (#3906)

* pkg,cdc: do not use log package (#3902) (#3940)

* *: rename repo from pingcap/ticdc to pingcap/tiflow (#3959)

* http_*: add log for http api and refine the err handle logic (#2997) (#3307)

* etcd_worker: batch etcd patch (#3277) (#3389)

* http_api (ticdc): check --cert-allowed-cn before add server common name (#3628) (#3882)

* kvclient(ticdc): fix kvclient takes too long time to recover (#3612) (#3663)

* owner: fix owner tick block http request (#3490) (#3530)

* dm/syncer: use downstream PK/UK to generate DML (#3168) (#3256)

* dep(dm): update go-mysql (#3914) (#3934)

* dm/syncer: multiple rows use downstream schema (#3308) (#3953)

* errorutil,sink,syncer: add errorutil to handle ignorable error (#3264) (#3995)

* dm/worker: don't exit when failed to read checkpoint in relay (#3345) (#4005)

* syncer(dm): use an early location to reset binlog and open safemode (#3860)

* ticdc/owner: Fix ddl special comment syntax error (#3845) (#3978)

* dm/scheduler: fix inconsistent of relay status (#3474) (#4009)

* owner,scheduler(cdc): fix nil pointer panic in owner scheduler (#2980) (#4007) (#4016)

* config(ticdc): Fix old value configuration check for maxwell protocol (#3747) (#3783)

* sink(ticdc): cherry pick sink bug fix to release 5.3 (#4083)

* master(dm): clean and treat invalid load task (#4004) (#4145)

* loader: fix wrong progress in query-status for loader (#4093) (#4143)

close #3252

* ticdc/processor: Fix backoff base delay misconfiguration (#3992) (#4028)

* dm: load table structure from dump files (#3295) (#4163)

* compactor: fix duplicate entry in safemode (#3432) (#3434) (#4088)

* kv(ticdc): reduce eventfeed rate limited log (#4072) (#4111)

close #4006

* metrics(ticdc): add resolved ts and add changefeed to dataflow (#4038) (#4104)

* This is an automated cherry-pick of #4192

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

* retry(dm): align with tidb latest error message (#4172) (#4254)

close #4159, close #4246

* owner(ticdc): Add bootstrap and try to fix the meta information in it (#3838) (#3865)

* redolog: add a precleanup process when s3 enable (#3525) (#3878)

* ddl(dm): make skipped ddl pass `SplitDDL()` (#4176) (#4227)

close #4173

* cdc/sink: remove Initialize method from the sink interface (#3682) (#3765)

Co-authored-by: Ling Jin <7138436+3AceShowHand@users.noreply.github.com>

* http_api (ticdc): fix http api 'get processor' panic. (#4117) (#4123)

close #3840

* sink (ticdc): fix a deadlock due to checkpointTs fall back in sinkNode (#4084) (#4099)

close #4055

* cdc/sink: adjust kafka initialization logic (#3192) (#4162)

* try fix conflicts.

* This is an automated cherry-pick of #4192

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

* fix conflicts.

* fix conflicts.

Co-authored-by: zhaoxinyu <zhaoxinyu512@gmail.com>
Co-authored-by: amyangfei <yangfei@pingcap.com>
Co-authored-by: lance6716 <lance6716@gmail.com>
Co-authored-by: sdojjy <sdojjy@qq.com>
Co-authored-by: Ling Jin <7138436+3AceShowHand@users.noreply.github.com>
Co-authored-by: 3AceShowHand <jinl1037@hotmail.com>
@asddongmen asddongmen deleted the fix_timezone branch June 7, 2022 08:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-4.0 Should cherry pick this PR to release-4.0 branch. needs-cherry-pick-release-5.0 Should cherry pick this PR to release-5.0 branch. needs-cherry-pick-release-5.1 Should cherry pick this PR to release-5.1 branch. needs-cherry-pick-release-5.2 Should cherry pick this PR to release-5.2 branch. needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CDC:ErrLoadTimezone on RHEL 6.8
5 participants