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.

Sign up for GitHub

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

feat(redis): redis 打包方式优化 #1547

Merged
merged 1 commit into from
Oct 27, 2023
Merged

feat(redis): redis 打包方式优化 #1547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions dbm-services/redis/db-tools/dbactuator/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
SHELL := /bin/bash
BASE_DIR = $(shell pwd)
SRV_NAME=dbactuator_redis
VERSION = 0.0.1

PACKAGE_PATH="dbm-services/redis/db-tools/dbactuator/cmd"

BUILD_FLAG = " -X ${PACKAGE_PATH}.version=${VERSION} -X ${PACKAGE_PATH}.buildstamp=`date -u '+%Y-%m-%d_%I:%M:%S%z'` -X ${PACKAGE_PATH}.githash=`git rev-parse HEAD` "

build:
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -gcflags="all=-trimpath=${PWD}" -asmflags="all=-trimpath=${PWD}" -ldflags ${BUILD_FLAG} -o ${BASE_DIR}/build/$(SRV_NAME) -v main.go

clean:
-rm ./bin/${SRV_NAME}

build:clean
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ./bin/$(SRV_NAME) -v main.go

.PHONY: init clean build
.PHONY: init clean build all
25 changes: 19 additions & 6 deletions dbm-services/redis/db-tools/dbactuator/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@ Copyright © 2022 NAME HERE <EMAIL ADDRESS>
package cmd

import (
"dbm-services/redis/db-tools/dbactuator/pkg/consts"
"dbm-services/redis/db-tools/dbactuator/pkg/jobmanager"
"dbm-services/redis/db-tools/dbactuator/pkg/util"
"encoding/base64"
"fmt"
"log"
"os"
"strings"

"dbm-services/redis/db-tools/dbactuator/pkg/consts"
"dbm-services/redis/db-tools/dbactuator/pkg/jobmanager"
"dbm-services/redis/db-tools/dbactuator/pkg/util"

"github.com/spf13/cobra"
)

Expand All @@ -34,11 +35,23 @@ var multiProcessConcurrency int

var showSupportedAtomJobs bool

var (
buildstamp, githash, version, external string
)

// RootCmd represents the base command when called without any subcommands
var RootCmd = &cobra.Command{
Use: "dbactuator_redis",
Short: "redis原子任务合集",
Long: `redis原子任务合集,包含Redis 以及 RedisProxy 安装、集群创建、备份、回档等等原子任务`,
Use: "dbactuator_redis",
Short: fmt.Sprintf(`redis原子任务合集
Version: %s
Githash: %s
External: %s
Buildstamp:%s`, version, githash, strings.ToUpper(external), buildstamp),
Long: fmt.Sprintf(`redis原子任务合集,包含Redis 以及 RedisProxy 安装、集群创建、备份、回档等等原子任务
Version: %s
Githash: %s
External: %s
Buildstamp:%s`, version, githash, strings.ToUpper(external), buildstamp),
// Uncomment the following line if your bare application
// has an action associated with it:
Run: func(cmd *cobra.Command, args []string) {
Expand Down
2 changes: 1 addition & 1 deletion dbm-services/redis/db-tools/dbactuator/tests/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ echo "DIR==$DIR"

cd .. && make build

cp ./bin/dbactuator_redis /data/install/
cp ./build/dbactuator_redis /data/install/

localTendisplusPkgName="/data/install/$tendisplusPkgName"
localTendisplusPkgMd5=""
Expand Down
22 changes: 4 additions & 18 deletions dbm-services/redis/db-tools/dbmon/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,10 @@
SRV_NAME=bk-dbmon

clean:
-rm ./bin/${SRV_NAME}

build:clean
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ./bin/$(SRV_NAME) -v main.go

build:
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ./build/$(SRV_NAME) -v main.go

LOCAL_PKG_DIR := $(shell eval "./bin/bk-dbmon -v|awk '{print $2}'")
version:=$(shell sh -c "./bin/bk-dbmon -v|awk '{print $1}'")

package:build
mkdir -p bkdbmon
cp ./bin/$(SRV_NAME) ./bkdbmon/
cp ./start.sh ./bkdbmon/
cp ./stop.sh ./bkdbmon/
cp ./dbmon-config.yaml ./bkdbmon/
clean:
-rm ./build/${SRV_NAME}

version:build
@echo LOCAL_PKG_DIR=$(LOCAL_PKG_DIR)
@echo version=$(version)

.PHONY: init clean build
25 changes: 12 additions & 13 deletions dbm-services/redis/db-tools/dbmon/package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,25 @@ cd $DIR

make build

version=$(./bin/bk-dbmon -v|awk '{print $2}')
version="v0.14"
cd build

version=$(./bk-dbmon -v | awk '{print $2}')
targetDir="bk-dbmon-$version"
tarName="$targetDir.tar.gz"

if [[ ! -d $targetDir ]]
then
if [[ ! -d $targetDir ]]; then
mkdir -p $targetDir
fi

cp ./bin/bk-dbmon $targetDir/
cp ./start.sh $targetDir/
cp ./stop.sh $targetDir/
cp ./dbmon-config.yaml $targetDir/
cp ./bk-dbmon $targetDir/
cp ../start.sh $targetDir/
cp ../stop.sh $targetDir/
cp ../dbmon-config.yaml $targetDir/

if [[ -e $tarName ]]
then
rm -rf $tarName
if [[ -e $tarName ]]; then
rm -rf $tarName
fi

tar -zcf $tarName $targetDir
tar --remove-files -zcf $tarName $targetDir

echo "$tarName success"
echo "$tarName success"
1 change: 1 addition & 0 deletions dbm-services/redis/db-tools/dbmon/pkg/consts/consts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ const (
ForeverBackupType = "forever_backup"
IBSBackupClient = "/usr/local/bin/backup_client"
COSBackupClient = "/usr/local/backup_client/bin/backup_client"
COSInfoFile = "/home/mysql/.cosinfo.toml"

RedisFullBackupTAG = "REDIS_FULL"
RedisBinlogTAG = "REDIS_BINLOG"
Expand Down
3 changes: 2 additions & 1 deletion dbm-services/redis/db-tools/dbmon/pkg/redisbinlogbackup/job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ func (job *Job) Run() {
defer job.Reporter.Close()

// job.backupClient = backupsys.NewIBSBackupClient(consts.IBSBackupClient, consts.RedisBinlogTAG)
job.backupClient, job.Err = backupsys.NewCosBackupClient(consts.COSBackupClient, "", consts.RedisBinlogTAG)
job.backupClient, job.Err = backupsys.NewCosBackupClient(consts.COSBackupClient,
consts.COSInfoFile, consts.RedisBinlogTAG)
if job.Err != nil {
return
}
Expand Down
3 changes: 2 additions & 1 deletion dbm-services/redis/db-tools/dbmon/pkg/redisbinlogbackup/task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ func NewBinlogBackupTask(bkBizID string, bkCloudID int64, domain, ip string, por
ShardValue: shardValue,
}
// ret.backupClient = backupsys.NewIBSBackupClient(consts.IBSBackupClient, consts.RedisBinlogTAG)
ret.backupClient, err = backupsys.NewCosBackupClient(consts.COSBackupClient, "", consts.RedisBinlogTAG)
ret.backupClient, err = backupsys.NewCosBackupClient(consts.COSBackupClient,
consts.COSInfoFile, consts.RedisBinlogTAG)
return ret, err
}

Expand Down
3 changes: 2 additions & 1 deletion dbm-services/redis/db-tools/dbmon/pkg/redisfullbackup/backupjob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ func (job *Job) Run() {
defer job.Reporter.Close()

// job.backupClient = backupsys.NewIBSBackupClient(consts.IBSBackupClient, consts.RedisFullBackupTAG)
job.backupClient, job.Err = backupsys.NewCosBackupClient(consts.COSBackupClient, "", consts.RedisFullBackupTAG)
job.backupClient, job.Err = backupsys.NewCosBackupClient(consts.COSBackupClient,
consts.COSInfoFile, consts.RedisFullBackupTAG)
if job.Err != nil {
return
}
Expand Down
3 changes: 2 additions & 1 deletion dbm-services/redis/db-tools/dbmon/pkg/redisfullbackup/checkjob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ func (job *CheckJob) Run() {
defer job.Reporter.Close()

// job.backupClient = backupsys.NewIBSBackupClient(consts.IBSBackupClient, consts.RedisFullBackupTAG)
job.backupClient, job.Err = backupsys.NewCosBackupClient(consts.COSBackupClient, "", consts.RedisFullBackupTAG)
job.backupClient, job.Err = backupsys.NewCosBackupClient(consts.COSBackupClient,
consts.COSInfoFile, consts.RedisFullBackupTAG)
if job.Err != nil {
return
}
Expand Down
3 changes: 2 additions & 1 deletion dbm-services/redis/db-tools/dbmon/pkg/redisfullbackup/task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ func NewFullBackupTask(bkBizID string, bkCloudID int64, domain, ip string, port
reporter: reporter,
}
// ret.backupClient = backupsys.NewIBSBackupClient(consts.IBSBackupClient, consts.RedisFullBackupTAG)
ret.backupClient, err = backupsys.NewCosBackupClient(consts.COSBackupClient, "", consts.RedisFullBackupTAG)
ret.backupClient, err = backupsys.NewCosBackupClient(consts.COSBackupClient,
consts.COSInfoFile, consts.RedisFullBackupTAG)
return
}

Expand Down
8 changes: 3 additions & 5 deletions dbm-services/redis/redis-dts/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
SRV_NAME= redis_dts_server
binDir=bin

clean:
-rm ./${binDir}/${SRV_NAME}

build:clean
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ./${binDir}/$(SRV_NAME) -v main.go
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ./build/$(SRV_NAME) -v main.go

clean:
-rm ./build/${SRV_NAME}

.PHONY: init clean build gotool clean help api curl
0 .../redis/redis-dts/bin/config-template.yaml → ...edis/redis-dts/build/config-template.yaml
View file
Open in desktop
File renamed without changes.
0 ...s/redis-dts/bin/redis-shake-template.conf → ...redis-dts/build/redis-shake-template.conf
View file
Open in desktop
File renamed without changes.
0 dbm-services/redis/redis-dts/bin/start.sh → dbm-services/redis/redis-dts/build/start.sh
View file
Open in desktop
File renamed without changes.
0 dbm-services/redis/redis-dts/bin/stop.sh → dbm-services/redis/redis-dts/build/stop.sh
View file
Open in desktop
File renamed without changes.
0 ...dis-dts/bin/tendisplus-sync-template.conf → ...s-dts/build/tendisplus-sync-template.conf
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...edis-dts/bin/tendisssd-sync-template.conf → ...is-dts/build/tendisssd-sync-template.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ key-black-regex={{KEY_BLACK_REGEX}}
{{DST_ADDR}}|{{DST_PASSWORD}}
{{DST_ADDR}}|{{DST_PASSWORD}}
{{DST_ADDR}}|{{DST_PASSWORD}}
{{DST_ADDR}}|{{DST_PASSWORD}}
{{DST_ADDR}}|{{DST_PASSWORD}}
Loading