From ea30120ee17574a68c8cf305e4109b8600f044c3 Mon Sep 17 00:00:00 2001 From: Weizhen Wang Date: Thu, 15 Dec 2022 15:00:26 +0800 Subject: [PATCH] resourcemanger: create cpu/memory monitor Signed-off-by: Weizhen Wang --- br/pkg/lightning/common/BUILD.bazel | 44 +------------------ br/pkg/lightning/web/BUILD.bazel | 1 + domain/domain.go | 4 -- .../featuretag/concurrencyddl/BUILD.bazel | 5 ++- .../featuretag/distributereorg/BUILD.bazel | 5 ++- util/signal/BUILD.bazel | 31 ++----------- util/sys/linux/BUILD.bazel | 43 +----------------- 7 files changed, 16 insertions(+), 117 deletions(-) diff --git a/br/pkg/lightning/common/BUILD.bazel b/br/pkg/lightning/common/BUILD.bazel index 880186fe1d700..a5245356b2715 100644 --- a/br/pkg/lightning/common/BUILD.bazel +++ b/br/pkg/lightning/common/BUILD.bazel @@ -34,49 +34,9 @@ go_library( "@org_golang_google_grpc//codes", "@org_golang_google_grpc//credentials", "@org_golang_google_grpc//status", + "@org_golang_x_sys//unix", "@org_uber_go_zap//:zap", - ] + select({ - "@io_bazel_rules_go//go/platform:aix": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:android": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:darwin": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:dragonfly": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:freebsd": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:illumos": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:ios": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:js": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:linux": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:netbsd": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:openbsd": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:plan9": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:solaris": [ - "@org_golang_x_sys//unix", - ], - "//conditions:default": [], - }), + ], ) go_test( diff --git a/br/pkg/lightning/web/BUILD.bazel b/br/pkg/lightning/web/BUILD.bazel index 30dbd2437697b..842eb48fb3dd3 100644 --- a/br/pkg/lightning/web/BUILD.bazel +++ b/br/pkg/lightning/web/BUILD.bazel @@ -4,6 +4,7 @@ go_library( name = "web", srcs = [ "progress.go", + "res.go", "res_vfsdata.go", ], importpath = "github.com/pingcap/tidb/br/pkg/lightning/web", diff --git a/domain/domain.go b/domain/domain.go index aafc366a47799..f548863d4aea3 100644 --- a/domain/domain.go +++ b/domain/domain.go @@ -67,7 +67,6 @@ import ( "github.com/pingcap/tidb/util/engine" "github.com/pingcap/tidb/util/expensivequery" "github.com/pingcap/tidb/util/logutil" - "github.com/pingcap/tidb/util/memory" "github.com/pingcap/tidb/util/memoryusagealarm" "github.com/pingcap/tidb/util/servermemorylimit" "github.com/pingcap/tidb/util/sqlexec" @@ -2076,9 +2075,6 @@ func (do *Domain) updateStatsWorker(ctx sessionctx.Context, owner owner.Manager) if err != nil { logutil.BgLogger().Debug("dump column stats usage failed", zap.Error(err)) } - - case <-readMemTricker.C: - memory.ForceReadMemStats() } } } diff --git a/sessionctx/variable/featuretag/concurrencyddl/BUILD.bazel b/sessionctx/variable/featuretag/concurrencyddl/BUILD.bazel index 37ac17a1804ec..44c1cede3c2b7 100644 --- a/sessionctx/variable/featuretag/concurrencyddl/BUILD.bazel +++ b/sessionctx/variable/featuretag/concurrencyddl/BUILD.bazel @@ -2,7 +2,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "concurrencyddl", - srcs = ["default.go"], + srcs = [ + "default.go", + "non_default.go", + ], importpath = "github.com/pingcap/tidb/sessionctx/variable/featuretag/concurrencyddl", visibility = ["//visibility:public"], ) diff --git a/sessionctx/variable/featuretag/distributereorg/BUILD.bazel b/sessionctx/variable/featuretag/distributereorg/BUILD.bazel index fb3bfb4835c1a..153ce052ecbb2 100644 --- a/sessionctx/variable/featuretag/distributereorg/BUILD.bazel +++ b/sessionctx/variable/featuretag/distributereorg/BUILD.bazel @@ -2,7 +2,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "distributereorg", - srcs = ["default.go"], + srcs = [ + "default.go", + "non_default.go", + ], importpath = "github.com/pingcap/tidb/sessionctx/variable/featuretag/distributereorg", visibility = ["//visibility:public"], ) diff --git a/util/signal/BUILD.bazel b/util/signal/BUILD.bazel index e2963d6f554bb..af19da427497c 100644 --- a/util/signal/BUILD.bazel +++ b/util/signal/BUILD.bazel @@ -9,31 +9,8 @@ go_library( ], importpath = "github.com/pingcap/tidb/util/signal", visibility = ["//visibility:public"], - deps = select({ - "@io_bazel_rules_go//go/platform:android": [ - "//util/logutil", - "@org_uber_go_zap//:zap", - ], - "@io_bazel_rules_go//go/platform:darwin": [ - "//util/logutil", - "@org_uber_go_zap//:zap", - ], - "@io_bazel_rules_go//go/platform:freebsd": [ - "//util/logutil", - "@org_uber_go_zap//:zap", - ], - "@io_bazel_rules_go//go/platform:ios": [ - "//util/logutil", - "@org_uber_go_zap//:zap", - ], - "@io_bazel_rules_go//go/platform:linux": [ - "//util/logutil", - "@org_uber_go_zap//:zap", - ], - "@io_bazel_rules_go//go/platform:windows": [ - "//util/logutil", - "@org_uber_go_zap//:zap", - ], - "//conditions:default": [], - }), + deps = [ + "//util/logutil", + "@org_uber_go_zap//:zap", + ], ) diff --git a/util/sys/linux/BUILD.bazel b/util/sys/linux/BUILD.bazel index f1363c2cb0d71..1212afe2fc3d9 100644 --- a/util/sys/linux/BUILD.bazel +++ b/util/sys/linux/BUILD.bazel @@ -9,48 +9,7 @@ go_library( ], importpath = "github.com/pingcap/tidb/util/sys/linux", visibility = ["//visibility:public"], - deps = select({ - "@io_bazel_rules_go//go/platform:aix": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:android": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:darwin": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:dragonfly": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:freebsd": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:illumos": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:ios": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:js": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:linux": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:netbsd": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:openbsd": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:plan9": [ - "@org_golang_x_sys//unix", - ], - "@io_bazel_rules_go//go/platform:solaris": [ - "@org_golang_x_sys//unix", - ], - "//conditions:default": [], - }), + deps = ["@org_golang_x_sys//unix"], ) go_test(