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

*(all): update dependencies on tidb and pd. #8126

Merged
merged 32 commits into from
Feb 8, 2023
Merged
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
dde7691
fix get source id error
asddongmen Jan 29, 2023
f8011ce
add unit test
asddongmen Jan 29, 2023
022862a
add unit test
asddongmen Jan 29, 2023
72c0087
fix fmt
asddongmen Jan 29, 2023
053c101
fix ut
asddongmen Jan 29, 2023
34b01cd
fix ut
asddongmen Jan 29, 2023
9c47ff4
fix ut
asddongmen Jan 29, 2023
dee9636
fix ut
asddongmen Jan 30, 2023
cb0aa87
add arch check to makefile
asddongmen Jan 30, 2023
9a0d3db
format makefile
asddongmen Jan 30, 2023
7bc84de
merge upstream/master
asddongmen Feb 3, 2023
37f27f7
update dependencies
asddongmen Feb 6, 2023
4181e92
update dependencies to master
asddongmen Feb 6, 2023
9a86faa
fix ut build error
asddongmen Feb 6, 2023
c46cd35
fix some retryable MySQL pattern
lance6716 Feb 6, 2023
712b87a
fix DM IT
lance6716 Feb 6, 2023
2affa94
try fix some tests
lance6716 Feb 6, 2023
7ad35b2
revert negligent change of go.mod
asddongmen Feb 6, 2023
ae2cb54
Merge branch 'fix-get-source-id' of github.com:asddongmen/ticdc into …
asddongmen Feb 6, 2023
4cd5a82
fix DM IT
lance6716 Feb 6, 2023
6148e9b
Merge branch 'fix-get-source-id' of github.com:asddongmen/ticdc into …
lance6716 Feb 6, 2023
ccaf0cb
fix DM IT
lance6716 Feb 6, 2023
1a060a7
fix DM IT
lance6716 Feb 6, 2023
310f0fe
fix some UT and IT
lance6716 Feb 6, 2023
696fa26
fix more
lance6716 Feb 6, 2023
775f97a
fix a DM IT
lance6716 Feb 6, 2023
c42dab2
address comments
asddongmen Feb 7, 2023
4b2e19b
address comments again
asddongmen Feb 7, 2023
03e6f46
remove debug log
asddongmen Feb 7, 2023
f1628fd
address comments
asddongmen Feb 7, 2023
3fd5f58
Update Makefile
asddongmen Feb 7, 2023
b35f4e9
Merge branch 'master' into fix-get-source-id
ti-chi-bot Feb 7, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update Makefile
Co-authored-by: 二手掉包工程师 <rustin.liu@gmail.com>
  • Loading branch information
asddongmen and Rustin170506 authored Feb 7, 2023

Verified

This commit was signed with the committer’s verified signature.
987Nabil Nabil Abdel-Hafeez
commit 3fd5f58297874a81f4b58b2cbd20ce9081106648
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -46,7 +46,6 @@ endif
# ref: https://github.com/cloudfoundry/gosigar/issues/58#issuecomment-1150925711
# ref: https://github.com/pingcap/tidb/pull/39526#issuecomment-1407952955
OS := "$(shell go env GOOS)"
#ARCH := "$(shell uname -s)"
ifeq (${OS}, "linux")
CGO := 0
Copy link
Member

Choose a reason for hiding this comment

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

What if someone cross compile macOS TiCDC on a linux machine?

Copy link
Member

Choose a reason for hiding this comment

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

I think only GOOS matters.

Copy link
Contributor Author

@asddongmen asddongmen Feb 7, 2023

Choose a reason for hiding this comment

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

Thank you! You are right, only GOOS matters, but no matter set CGO_ENABLED=0 or CGO_ENABLED=1 runGOOS=darwin make cdc fails.
I revert related changes and run the following commands:

➜  ticdc git:(fix-get-source-id) uname
Linux
➜  ticdc git:(fix-get-source-id) uname -m
x86_64

➜  ticdc git:(fix-get-source-id) CGO_ENABLED=0 GOOS=darwin make cdc
GO111MODULE=on go build  -trimpath  -ldflags '-X "github.com/pingcap/tiflow/pkg/version.ReleaseVersion=v6.5.0-master-dirty" -X "github.com/pingcap/tiflow/pkg/version.BuildTS=2023-02-07 09:41:40" -X "github.com/pingcap/tiflow/pkg/version.GitHash=03e6f4650e98fe8b47788622844fc1a5f9272ead" -X "github.com/pingcap/tiflow/pkg/version.GitBranch=fix-get-source-id" -X "github.com/pingcap/tiflow/pkg/version.GoVersion=go version go1.19.3 linux/amd64"' -o bin/cdc ./cmd/cdc/main.go
# github.com/cloudfoundry/gosigar
vendor/github.com/cloudfoundry/gosigar/concrete_sigar.go:20:12: cpuUsage.Get undefined (type Cpu has no field or method Get)
vendor/github.com/cloudfoundry/gosigar/concrete_sigar.go:30:14: cpuUsage.Get undefined (type Cpu has no field or method Get)
vendor/github.com/cloudfoundry/gosigar/concrete_sigar.go:49:11: l.Get undefined (type LoadAverage has no field or method Get)
vendor/github.com/cloudfoundry/gosigar/concrete_sigar.go:55:11: m.Get undefined (type Mem has no field or method Get)
vendor/github.com/cloudfoundry/gosigar/concrete_sigar.go:61:11: m.GetIgnoringCGroups undefined (type Mem has no field or method GetIgnoringCGroups)
vendor/github.com/cloudfoundry/gosigar/concrete_sigar.go:67:11: s.Get undefined (type Swap has no field or method Get)
vendor/github.com/cloudfoundry/gosigar/sigar_shared.go:12:21: procTime.Get undefined (type *ProcTime has no field or method Get)
^Cmake: *** [cdc] Interrupt

➜  ticdc git:(fix-get-source-id) ✗ CGO_ENABLED=1 GOOS=darwin make cdc
GO111MODULE=on go build  -trimpath  -ldflags '-X "github.com/pingcap/tiflow/pkg/version.ReleaseVersion=v6.5.0-master-dirty" -X "github.com/pingcap/tiflow/pkg/version.BuildTS=2023-02-07 09:41:32" -X "github.com/pingcap/tiflow/pkg/version.GitHash=03e6f4650e98fe8b47788622844fc1a5f9272ead" -X "github.com/pingcap/tiflow/pkg/version.GitBranch=fix-get-source-id" -X "github.com/pingcap/tiflow/pkg/version.GoVersion=go version go1.19.3 linux/amd64"' -o bin/cdc ./cmd/cdc/main.go
# runtime/cgo
gcc: error: x86_64: No such file or directory
gcc: error: unrecognized command line option '-arch'
make: *** [cdc] Error 2

Do you have any idea to fix this problem?

Copy link
Contributor

Choose a reason for hiding this comment

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

pingcap/tidb#41165

use CGO_ENABLED=1 is the only way to build on darwin.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

pingcap/tidb#41165

use CGO_ENABLED=1 is the only way to build on darwin.

Yes, but can't build a darwin cdc on linux machine.

else ifeq (${OS}, "darwin")
Rustin170506 marked this conversation as resolved.
Show resolved Hide resolved