tweak: add fallback to keep compatibility in scenarios without inject…

… distro info (pingcap#976)
shhdgit · Sep 2, 2021 · fa64d96 · fa64d96
1 parent 29034af
commit fa64d96
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 23 deletions.
diff --git a/cmd/tidb-dashboard/main.go b/cmd/tidb-dashboard/main.go
@@ -47,7 +47,6 @@ import (
 	keyvisualregion "github.com/pingcap/tidb-dashboard/pkg/keyvisual/region"
 	"github.com/pingcap/tidb-dashboard/pkg/swaggerserver"
 	"github.com/pingcap/tidb-dashboard/pkg/uiserver"
-	_ "github.com/pingcap/tidb-dashboard/pkg/utils/distro/populate"
 	"github.com/pingcap/tidb-dashboard/pkg/utils/version"
 )
 

diff --git a/pkg/utils/distro/distro.go b/pkg/utils/distro/distro.go
@@ -27,7 +27,16 @@ func Replace(distro introData) {
 }
 
 func Data(k string) string {
-	d := data.Load().(introData)
+	var d introData
+	atomd := data.Load()
+	// we need a fallback to keep compatibility in scenarios without inject distro info
+	// related issue: https://github.com/pingcap/tidb-dashboard/issues/975
+	if d == nil {
+		d = Resource
+	} else {
+		d = atomd.(introData)
+	}
+
 	if d[k] == "" {
 		return k
 	}

diff --git a/pkg/utils/distro/populate/populate.go b/pkg/utils/distro/populate/populate.go