feat: manager grpc

Signed-off-by: Gaius <gaius.qi@gmail.com>
dragonflyoss · Aug 11, 2021 · 91b91e6 · 91b91e6
1 parent 05f56c7
commit 91b91e6
Show file tree

Hide file tree

Showing 10 changed files with 291 additions and 648 deletions.
diff --git a/manager/cache/cache.go b/manager/cache/cache.go
@@ -9,6 +9,11 @@ import (
 	"github.com/go-redis/cache/v8"
 )
 
+const (
+	CDNNamespace       = "cdn"
+	SchedulerNamespace = "scheduler"
+)
+
 type Cache struct {
 	*cache.Cache
 	TTL time.Duration
@@ -33,5 +38,13 @@ func New(cfg *config.Config) *Cache {
 }
 
 func MakeCacheKey(namespace string, id string) string {
-	return fmt.Sprintf("manager: %s: %s", namespace, id)
+	return fmt.Sprintf("manager:%s:%s", namespace, id)
+}
+
+func MakeCDNCacheKey(hostname, clusterID string) string {
+	return MakeCacheKey(CDNNamespace, fmt.Sprintf("%s-%s", hostname, clusterID))
+}
+
+func MakeSchedulerCacheKey(hostname, clusterID string) string {
+	return MakeCacheKey(SchedulerNamespace, fmt.Sprintf("%s-%s", hostname, clusterID))
 }
diff --git a/manager/model/cdn.go b/manager/model/cdn.go
@@ -7,13 +7,13 @@ const (
 
 type CDN struct {
 	Model
-	HostName     string     `gorm:"column:host_name;type:varchar(256);index:uk_scheduler_cluster_name,unique;not null;comment:hostname" json:"host_name"`
+	HostName     string     `gorm:"column:host_name;type:varchar(256);index:uk_cdn,unique;not null;comment:hostname" json:"host_name"`
 	IDC          string     `gorm:"column:idc;type:varchar(1024);comment:internet data center" json:"idc"`
 	Location     string     `gorm:"column:location;type:varchar(1024);comment:location" json:"location"`
 	IP           string     `gorm:"column:ip;type:varchar(256);not null;comment:ip address" json:"ip"`
 	Port         int32      `gorm:"column:port;not null;comment:grpc service listening port" json:"port"`
 	DownloadPort int32      `gorm:"column:download_port;not null;comment:download service listening port" json:"download_port"`
 	Status       string     `gorm:"column:status;type:varchar(256);default:'inactive';comment:service status" json:"status"`
-	CDNClusterID *uint      `gorm:"index:idx_cdn_cluster_cd_ns;comment:cdn cluster id"`
+	CDNClusterID *uint      `gorm:"index:uk_cdn,unique;not null;comment:cdn cluster id"`
 	CDNCluster   CDNCluster `json:"-"`
 }
diff --git a/manager/model/scheduler.go b/manager/model/scheduler.go
@@ -7,14 +7,14 @@ const (
 
 type Scheduler struct {
 	Model
-	HostName           string           `gorm:"column:host_name;type:varchar(256);index:uk_scheduler_host_name,unique;not null;comment:hostname" json:"host_name"`
+	HostName           string           `gorm:"column:host_name;type:varchar(256);index:uk_scheduler,unique;not null;comment:hostname" json:"host_name"`
 	VIPs               string           `gorm:"column:vips;type:varchar(1024);comment:virtual ip address" json:"vips"`
 	IDC                string           `gorm:"column:idc;type:varchar(1024);comment:internet data center" json:"idc"`
 	Location           string           `gorm:"column:location;type:varchar(1024);comment:location" json:"location"`
 	NetConfig          JSONMap          `gorm:"column:net_config;comment:network configuration" json:"net_config"`
 	IP                 string           `gorm:"column:ip;type:varchar(256);not null;comment:ip address" json:"ip"`
 	Port               int32            `gorm:"column:port;not null;comment:grpc service listening port" json:"port"`
 	Status             string           `gorm:"column:status;type:varchar(256);default:'inactive';comment:service status" json:"status"`
-	SchedulerClusterID *uint            `gorm:"comment:scheduler cluster id"`
+	SchedulerClusterID *uint            `gorm:"index:uk_scheduler,unique;not null;comment:scheduler cluster id"`
 	SchedulerCluster   SchedulerCluster `json:"-"`
 }
diff --git a/manager/service/cdn.go b/manager/service/cdn.go
@@ -13,6 +13,7 @@ func (s *rest) CreateCDN(json types.CreateCDNRequest) (*model.CDN, error) {
 		IP:           json.IP,
 		Port:         json.Port,
 		DownloadPort: json.DownloadPort,
+		CDNClusterID: json.CDNClusterID,
 	}
 
 	if err := s.db.Create(&cdn).Error; err != nil {
@@ -38,6 +39,7 @@ func (s *rest) UpdateCDN(id uint, json types.UpdateCDNRequest) (*model.CDN, erro
 		IP:           json.IP,
 		Port:         json.Port,
 		DownloadPort: json.DownloadPort,
+		CDNClusterID: json.CDNClusterID,
 	}).Error; err != nil {
 		return nil, err
 	}
@@ -63,6 +65,7 @@ func (s *rest) GetCDNs(q types.GetCDNsQuery) (*[]model.CDN, error) {
 		IP:           q.IP,
 		Port:         q.Port,
 		DownloadPort: q.DownloadPort,
+		CDNClusterID: q.CDNClusterID,
 	}).Find(&cdns).Error; err != nil {
 		return nil, err
 	}
@@ -79,6 +82,7 @@ func (s *rest) CDNTotalCount(q types.GetCDNsQuery) (int64, error) {
 		IP:           q.IP,
 		Port:         q.Port,
 		DownloadPort: q.DownloadPort,
+		CDNClusterID: q.CDNClusterID,
 	}).Count(&count).Error; err != nil {
 		return 0, err
 	}

diff --git a/manager/types/cdn.go b/manager/types/cdn.go
@@ -11,6 +11,7 @@ type CreateCDNRequest struct {
 	IP           string `json:"ip" binding:"required"`
 	Port         int32  `json:"port" binding:"required"`
 	DownloadPort int32  `json:"download_port" binding:"required"`
+	CDNClusterID *uint  `json:"cdn_cluster_id" binding:"required"`
 }
 
 type UpdateCDNRequest struct {
@@ -19,7 +20,7 @@ type UpdateCDNRequest struct {
 	IP           string `json:"ip" binding:"omitempty"`
 	Port         int32  `json:"port" binding:"omitempty"`
 	DownloadPort int32  `json:"download_port" binding:"omitempty"`
-	CDNID        *uint  `json:"cdn_id" binding:"omitempty"`
+	CDNClusterID *uint  `json:"cdn_cluster_id" binding:"omitempty"`
 }
 
 type GetCDNsQuery struct {
@@ -29,6 +30,7 @@ type GetCDNsQuery struct {
 	IP           string `form:"ip" binding:"omitempty"`
 	Port         int32  `form:"port" binding:"omitempty"`
 	DownloadPort int32  `form:"download_port" binding:"omitempty"`
+	CDNClusterID *uint  `json:"cdn_cluster_id" binding:"omitempty"`
 	Page         int    `form:"page" binding:"omitempty,gte=1"`
 	PerPage      int    `form:"per_page" binding:"omitempty,gte=1,lte=50"`
 	Status       string `form:"status" binding:"omitempty,oneof=active inactive"`