Merge branch 'master' into feat/support-revoke-share-code

pingcap · Aug 30, 2024 · 41228b2 · 41228b2
2 parents 06b71d8 + 6a0d342
commit 41228b2
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 3 deletions.
diff --git a/pkg/apiserver/profiling/fetcher.go b/pkg/apiserver/profiling/fetcher.go
@@ -146,6 +146,37 @@ type tiflashFetcher struct {
 }
 
 func (f *tiflashFetcher) fetch(op *fetchOptions) ([]byte, error) {
+	if strings.HasSuffix(op.path, "heap") {
+		scheme := f.client.GetHTTPScheme()
+		cmd := exec.Command("perl", "/dev/stdin", "--raw", scheme+"://"+op.ip+":"+strconv.Itoa(op.port)+op.path) //nolint:gosec
+		cmd.Stdin = strings.NewReader(jeprof)
+		stdout, err := cmd.StdoutPipe()
+		if err != nil {
+			return nil, err
+		}
+		stderr, err := cmd.StderrPipe()
+		if err != nil {
+			return nil, err
+		}
+		// use jeprof to fetch tiflash heap profile
+		err = cmd.Start()
+		if err != nil {
+			return nil, err
+		}
+		data, err := io.ReadAll(stdout)
+		if err != nil {
+			return nil, err
+		}
+		errMsg, err := io.ReadAll(stderr)
+		if err != nil {
+			return nil, err
+		}
+		err = cmd.Wait()
+		if err != nil {
+			return nil, fmt.Errorf("failed to fetch tiflash heap profile: %s", errMsg)
+		}
+		return data, nil
+	}
 	return f.client.WithTimeout(maxProfilingTimeout).AddRequestHeader("Content-Type", "application/protobuf").SendGetRequest(op.ip, op.port, op.path)
 }
 

diff --git a/pkg/apiserver/profiling/pprof.go b/pkg/apiserver/profiling/pprof.go
@@ -46,7 +46,7 @@ func (f *fetcher) FetchAndWriteToFile(duration uint, fileNameWithoutExt string,
 		fileExtenstion = "*.proto"
 	case ProfilingTypeHeap:
 		url = "/debug/pprof/heap"
-		if f.target.Kind == model.NodeKindTiKV {
+		if f.target.Kind == model.NodeKindTiKV || f.target.Kind == model.NodeKindTiFlash {
 			profilingRawDataType = RawDataTypeJeprof
 			fileExtenstion = "*.prof"
 		} else {

diff --git a/pkg/apiserver/profiling/profile.go b/pkg/apiserver/profiling/profile.go
@@ -17,8 +17,8 @@ func profileAndWritePprof(_ context.Context, fts *fetchers, target *model.Reques
 		}
 		return fetchPprof(&pprofOptions{duration: profileDurationSecs, fileNameWithoutExt: fileNameWithoutExt, target: target, fetcher: &fts.tikv, profilingType: profilingType})
 	case model.NodeKindTiFlash:
-		// TiFlash only supports CPU Profiling
-		if profilingType != ProfilingTypeCPU {
+		// TiFlash only supports CPU/heap Profiling
+		if profilingType != ProfilingTypeCPU && profilingType != ProfilingTypeHeap {
 			return "", "", ErrUnsupportedProfilingType.NewWithNoMessage()
 		}
 		return fetchPprof(&pprofOptions{duration: profileDurationSecs, fileNameWithoutExt: fileNameWithoutExt, target: target, fetcher: &fts.tiflash, profilingType: profilingType})

diff --git a/pkg/tiflash/client.go b/pkg/tiflash/client.go
@@ -49,6 +49,10 @@ func NewTiFlashClient(lc fx.Lifecycle, httpClient *httpc.Client, config *config.
 	return client
 }
 
+func (c Client) GetHTTPScheme() string {
+	return c.httpScheme
+}
+
 func (c Client) WithTimeout(timeout time.Duration) *Client {
 	c.timeout = timeout
 	return &c

diff --git a/ui/packages/tidb-dashboard-for-clinic-cloud/src/apps/UserProfile/context.ts b/ui/packages/tidb-dashboard-for-clinic-cloud/src/apps/UserProfile/context.ts
@@ -4,6 +4,7 @@ import {
   ReqConfig,
   IUserProfileEvent
 } from '@pingcap/tidb-dashboard-lib'
+import { AxiosPromise } from 'axios'
 
 import client, {
   SsoCreateImpersonationRequest,
@@ -39,6 +40,11 @@ class DataSource implements IUserProfileDataSource {
   userShareSession(request: CodeShareRequest, options?: ReqConfig) {
     return client.getInstance().userShareSession({ request }, options)
   }
+
+  userRevokeSession(options?: ReqConfig) {
+    return client.getInstance().userRevokeSession(options)
+  }
+
   metricsGetPromAddress(options?: ReqConfig) {
     return client.getInstance().metricsGetPromAddress(options)
   }

diff --git a/ui/packages/tidb-dashboard-lib/src/apps/ContinuousProfiling/pages/Detail.tsx b/ui/packages/tidb-dashboard-lib/src/apps/ContinuousProfiling/pages/Detail.tsx
@@ -106,6 +106,19 @@ export default function Page() {
             break
           default:
         }
+      } else if (component === 'tiflash' && profile_type === 'heap') {
+        switch (action) {
+          case Action.VIEW_FLAMEGRAPH:
+            dataFormat = 'text'
+            break
+          case Action.VIEW_GRAPH:
+            dataFormat = 'svg'
+            break
+          case Action.DOWNLOAD:
+            dataFormat = 'jeprof'
+            break
+          default:
+        }
       } else {
         switch (action) {
           case Action.VIEW_GRAPH: