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

Complement ProcessRole and ProcessClass #1522

Merged
merged 3 commits into from
Mar 3, 2023
Merged

Complement ProcessRole and ProcessClass #1522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ce9579
Complement ProcessRole and ProcessClass
mengzhbj Feb 27, 2023
ffa7bc5
Update api/v1beta2/foundationdb_status.go
mengzhbj Mar 1, 2023
586425b
Correct errors in names
mengzhbj Mar 1, 2023
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
6 changes: 6 additions & 0 deletions api/v1beta2/foundationdb_process_class.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ const (
ProcessClassTest ProcessClass = "test"
// ProcessClassCoordinator model for FDB class coordinator
ProcessClassCoordinator ProcessClass = "coordinator"
// ProcessClassProxy model for FDB proxy processes
ProcessClassProxy ProcessClass = "proxy"
// ProcessClassCommitProxy model for FDB commit_proxy processes
ProcessClassCommitProxy ProcessClass = "commit_proxy"
// ProcessClassGrvProxy model for FDB grv_proxy processes
ProcessClassGrvProxy ProcessClass = "grv_proxy"
)

// IsStateful determines whether a process class should store data.
Expand Down
23 changes: 22 additions & 1 deletion api/v1beta2/foundationdb_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,31 @@ type FoundationDBStatusBackupTag struct {
// ProcessRole models the role of a pod.
type ProcessRole string

// TODO (johscheuer): add more roles to this list
const (
// ProcessRoleCoordinator model for FDB coordinator role.
ProcessRoleCoordinator ProcessRole = "coordinator"
// ProcessRoleClusterController model for FDB cluster_controller role
ProcessRoleClusterController ProcessRole = "cluster_controller"
// ProcessRoleStorage model for FDB storage role
ProcessRoleStorage ProcessRole = "storage"
// ProcessRoleLog model for FDB log role
ProcessRoleLog ProcessRole = "log"
// ProcessRoleSequencer model for FDB sequencer role
ProcessRoleSequencer ProcessRole = "sequencer"
// ProcessRoleMaster model for FDB master role
ProcessRoleMaster ProcessRole = "master"
// ProcessRoleProxy model for FDB proxy role
ProcessRoleProxy ProcessRole = "proxy"
// ProcessRoleGrvProxy model for FDB grv_proxy role
ProcessRoleGrvProxy ProcessRole = "grv_proxy"
// ProcessRoleCommitProxy model for FDB commit_proxy role
ProcessRoleCommitProxy ProcessRole = "commit_proxy"
// ProcessRoleResolver model for FDB resolver role
ProcessRoleResolver ProcessRole = "resolver"
// ProcessRoleDataDistributor model for FDB data_distributor role
ProcessRoleDataDistributor ProcessRole = "data_distributor"
// ProcessRoleRatekeeper model for FDB ratekeeper role
ProcessRoleRatekeeper ProcessRole = "ratekeeper"
)

// RecoveryState represents the recovery state from the FDB cluster json.
Expand Down
56 changes: 28 additions & 28 deletions api/v1beta2/foundationdb_status_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ var _ = Describe("FoundationDBStatus", func() {
UptimeSeconds: 2955.58,
Roles: []FoundationDBStatusProcessRoleInfo{
{
Role: "log",
Role: string(ProcessRoleLog),
},
},
Messages: []FoundationDBStatusProcessMessage{},
Expand All @@ -127,10 +127,10 @@ var _ = Describe("FoundationDBStatus", func() {
UptimeSeconds: 2475.33,
Roles: []FoundationDBStatusProcessRoleInfo{
{
Role: "proxy",
Role: string(ProcessRoleProxy),
},
{
Role: "storage",
Role: string(ProcessRoleStorage),
},
},
Messages: []FoundationDBStatusProcessMessage{},
Expand All @@ -153,10 +153,10 @@ var _ = Describe("FoundationDBStatus", func() {
UptimeSeconds: 2951.17,
Roles: []FoundationDBStatusProcessRoleInfo{
{
Role: "proxy",
Role: string(ProcessRoleProxy),
},
{
Role: "storage",
Role: string(ProcessRoleStorage),
},
},
Messages: []FoundationDBStatusProcessMessage{},
Expand All @@ -179,10 +179,10 @@ var _ = Describe("FoundationDBStatus", func() {
UptimeSeconds: 710.119,
Roles: []FoundationDBStatusProcessRoleInfo{
{
Role: "cluster_controller",
Role: string(ProcessRoleClusterController),
},
{
Role: "log",
Role: string(ProcessRoleLog),
},
},
Messages: []FoundationDBStatusProcessMessage{},
Expand All @@ -208,7 +208,7 @@ var _ = Describe("FoundationDBStatus", func() {
Role: string(ProcessRoleCoordinator),
},
{
Role: "resolver",
Role: string(ProcessRoleResolver),
},
},
Messages: []FoundationDBStatusProcessMessage{},
Expand All @@ -231,19 +231,19 @@ var _ = Describe("FoundationDBStatus", func() {
UptimeSeconds: 880.18,
Roles: []FoundationDBStatusProcessRoleInfo{
{
Role: "master",
Role: string(ProcessRoleMaster),
},
{
Role: "data_distributor",
Role: string(ProcessRoleDataDistributor),
},
{
Role: "ratekeeper",
Role: string(ProcessRoleRatekeeper),
},
{
Role: string(ProcessRoleCoordinator),
},
{
Role: "log",
Role: string(ProcessRoleLog),
},
},
Messages: []FoundationDBStatusProcessMessage{},
Expand All @@ -269,10 +269,10 @@ var _ = Describe("FoundationDBStatus", func() {
Role: string(ProcessRoleCoordinator),
},
{
Role: "proxy",
Role: string(ProcessRoleProxy),
},
{
Role: "storage",
Role: string(ProcessRoleStorage),
},
},
Messages: []FoundationDBStatusProcessMessage{},
Expand Down Expand Up @@ -500,9 +500,9 @@ var _ = Describe("FoundationDBStatus", func() {
Version: "7.1.0-rc1",
UptimeSeconds: 85.0026,
Roles: []FoundationDBStatusProcessRoleInfo{
{Role: "coordinator"},
{Role: "grv_proxy"},
{Role: "storage"},
{Role: string(ProcessRoleCoordinator)},
{Role: string(ProcessRoleGrvProxy)},
{Role: string(ProcessRoleStorage)},
},
Messages: []FoundationDBStatusProcessMessage{},
},
Expand All @@ -523,9 +523,9 @@ var _ = Describe("FoundationDBStatus", func() {
Version: "7.1.0-rc1",
UptimeSeconds: 85.0031,
Roles: []FoundationDBStatusProcessRoleInfo{
{Role: "coordinator"},
{Role: string(ProcessRoleCoordinator)},
{Role: string(ProcessClassStorage)},
{Role: "resolver"},
{Role: string(ProcessRoleResolver)},
},
Messages: []FoundationDBStatusProcessMessage{},
},
Expand All @@ -546,9 +546,9 @@ var _ = Describe("FoundationDBStatus", func() {
Version: "7.1.0-rc1",
UptimeSeconds: 85.0029,
Roles: []FoundationDBStatusProcessRoleInfo{
{Role: "coordinator"},
{Role: "commit_proxy"},
{Role: "storage"},
{Role: string(ProcessRoleCoordinator)},
{Role: string(ProcessRoleCommitProxy)},
{Role: string(ProcessRoleStorage)},
},
Messages: []FoundationDBStatusProcessMessage{},
},
Expand All @@ -569,9 +569,9 @@ var _ = Describe("FoundationDBStatus", func() {
Version: "7.1.0-rc1",
UptimeSeconds: 85.0027,
Roles: []FoundationDBStatusProcessRoleInfo{
{Role: "master"},
{Role: "data_distributor"},
{Role: "ratekeeper"},
{Role: string(ProcessRoleMaster)},
{Role: string(ProcessRoleDataDistributor)},
{Role: string(ProcessRoleRatekeeper)},
},
Messages: []FoundationDBStatusProcessMessage{},
},
Expand Down Expand Up @@ -613,7 +613,7 @@ var _ = Describe("FoundationDBStatus", func() {
Version: "7.1.0-rc1",
UptimeSeconds: 85.0029,
Roles: []FoundationDBStatusProcessRoleInfo{
{Role: "log"},
{Role: string(ProcessRoleLog)},
},
Messages: []FoundationDBStatusProcessMessage{},
},
Expand All @@ -634,7 +634,7 @@ var _ = Describe("FoundationDBStatus", func() {
Version: "7.1.0-rc1",
UptimeSeconds: 85.003,
Roles: []FoundationDBStatusProcessRoleInfo{
{Role: "log"},
{Role: string(ProcessRoleLog)},
},
Messages: []FoundationDBStatusProcessMessage{},
},
Expand All @@ -655,7 +655,7 @@ var _ = Describe("FoundationDBStatus", func() {
Version: "7.1.0-rc1",
UptimeSeconds: 85.0027,
Roles: []FoundationDBStatusProcessRoleInfo{
{Role: "log"},
{Role: string(ProcessRoleLog)},
},
Messages: []FoundationDBStatusProcessMessage{},
},
Expand Down