Skip to content

Commit

Permalink
[CLOUD-86] Introduce an explicit allInOne parameter to identify singl…
Browse files Browse the repository at this point in the history 
…e_node RonDB clusters (#243)
  • Loading branch information
@maismail
maismail authored Mar 9, 2023
1 parent e66fe2a commit 4a37712
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 168 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
## 1.4.0 (Unreleased)

NOTES:
Old terraform providers would fail to create new single_node RonDB clusters, so you they need to update to this version.

ENHANCEMENTS:
* dependencies: Bump hashicorp/terraform-plugin-log from 0.7.0 to 0.8.0
* dependencies: Bump hashicorp/terraform-plugin-sdk/v2 from 2.24.1 to 2.25.0
* dependencies: Bump hashicorp/terraform-plugin-docs from 0.13.0 to 0.14.1
* datasource/dataSourceAWSInstanceProfilePolicy: Add possibility to limit permissions to region, user ecr account and hopsworks.ai ecr account.
* remove unusued AWS permissions from instance profile policy
* resource/hopsworksai_cluster: introduce an explicit allInOne parameter instead of detecting allInOne RonDB implicitly

BUG FIXES:

Expand Down
3 changes: 3 additions & 0 deletions hopsworksai/internal/api/apis_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ func TestNewClusterAWS(t *testing.T) {
}
],
"ronDB": {
"allInOne": false,
"configuration": {
"ndbdDefault": {
"replicationFactor": 2
Expand Down Expand Up @@ -726,6 +727,7 @@ func TestNewClusterAZURE(t *testing.T) {
}
],
"ronDB": {
"allInOne": false,
"configuration": {
"ndbdDefault": {
"replicationFactor": 2
Expand Down Expand Up @@ -2443,6 +2445,7 @@ func TestNewClusterAWS_HA(t *testing.T) {
}
],
"ronDB": {
"allInOne": false,
"configuration": {
"ndbdDefault": {
"replicationFactor": 2
Expand Down
5 changes: 1 addition & 4 deletions hopsworksai/internal/api/model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,17 +123,14 @@ type RonDBNodeConfiguration struct {
}

type RonDBConfiguration struct {
AllInOne bool `json:"allInOne"`
Configuration RonDBBaseConfiguration `json:"configuration"`
ManagementNodes RonDBNodeConfiguration `json:"mgmd"`
DataNodes RonDBNodeConfiguration `json:"ndbd"`
MYSQLNodes RonDBNodeConfiguration `json:"mysqld"`
APINodes RonDBNodeConfiguration `json:"api"`
}

func (rondb *RonDBConfiguration) IsSingleNodeSetup() bool {
return rondb.Configuration.NdbdDefault.ReplicationFactor == 1 && rondb.DataNodes.Count == 1 && rondb.MYSQLNodes.Count == 1
}

type SpotConfiguration struct {
MaxPrice int `json:"maxPrice"`
FallBackOnDemand bool `json:"fallBackOnDemand"`
Expand Down
55 changes: 0 additions & 55 deletions hopsworksai/internal/api/model_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,58 +410,3 @@ func TestBackupStateString(t *testing.T) {
}
}
}

func TestIsSingleRonDBSetup(t *testing.T) {
input := &RonDBConfiguration{
Configuration: RonDBBaseConfiguration{
NdbdDefault: RonDBNdbdDefaultConfiguration{
ReplicationFactor: 1,
},
},
ManagementNodes: RonDBNodeConfiguration{
NodeConfiguration: NodeConfiguration{
InstanceType: "mgm-node-1",
DiskSize: 30,
},
Count: 1,
},
DataNodes: RonDBNodeConfiguration{
NodeConfiguration: NodeConfiguration{
InstanceType: "data-node-1",
DiskSize: 512,
},
Count: 1,
},
MYSQLNodes: RonDBNodeConfiguration{
NodeConfiguration: NodeConfiguration{
InstanceType: "mysqld-node-1",
DiskSize: 100,
},
Count: 1,
},
}

if !input.IsSingleNodeSetup() {
t.Fatalf("expected RonDB %#v to be single node setup but got false", *input)
}

input.Configuration.NdbdDefault.ReplicationFactor = 2

if input.IsSingleNodeSetup() {
t.Fatalf("expected RonDB %#v to be a cluster setup but got false", *input)
}

input.Configuration.NdbdDefault.ReplicationFactor = 1
input.MYSQLNodes.Count = 2

if input.IsSingleNodeSetup() {
t.Fatalf("expected RonDB %#v to be a cluster setup but got false", *input)
}

input.Configuration.NdbdDefault.ReplicationFactor = 2
input.DataNodes.Count = 2

if input.IsSingleNodeSetup() {
t.Fatalf("expected RonDB %#v to be a cluster setup but got false", *input)
}
}
2 changes: 1 addition & 1 deletion hopsworksai/internal/structure/cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ func flattenRonDB(ronDB *api.RonDBConfiguration) []map[string]interface{} {
return nil
}

if ronDB.IsSingleNodeSetup() {
if ronDB.AllInOne {
singleNode :=
map[string]interface{}{
"instance_type": ronDB.DataNodes.InstanceType,
Expand Down
1 change: 1 addition & 0 deletions hopsworksai/internal/structure/cluster_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1947,6 +1947,7 @@ func TestFlattenRonDBNodeConfiguration(t *testing.T) {

func TestFlattenRonDB_single_node(t *testing.T) {
input := &api.RonDBConfiguration{
AllInOne: true,
Configuration: api.RonDBBaseConfiguration{
NdbdDefault: api.RonDBNdbdDefaultConfiguration{
ReplicationFactor: 1,
Expand Down
19 changes: 15 additions & 4 deletions hopsworksai/resource_cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1323,6 +1323,7 @@ func createClusterBaseRequest(d *schema.ResourceData) (*api.CreateCluster, error
defaultRonDB := defaultRonDBConfiguration()
if singleRonDB, ok := d.GetOk("rondb.0.single_node"); ok {
createCluster.RonDB = &api.RonDBConfiguration{
AllInOne: true,
Configuration: api.RonDBBaseConfiguration{
NdbdDefault: api.RonDBNdbdDefaultConfiguration{
ReplicationFactor: 1,
Expand All @@ -1340,6 +1341,12 @@ func createClusterBaseRequest(d *schema.ResourceData) (*api.CreateCluster, error
},
Count: 1,
},
APINodes: api.RonDBNodeConfiguration{
NodeConfiguration: api.NodeConfiguration{
DiskSize: defaultRonDB.APINodes.DiskSize,
},
Count: 0,
},
DataNodes: api.RonDBNodeConfiguration{
NodeConfiguration: structure.ExpandNode(singleRonDB.([]interface{})[0].(map[string]interface{})),
Count: 1,
Expand All @@ -1357,6 +1364,7 @@ func createClusterBaseRequest(d *schema.ResourceData) (*api.CreateCluster, error
}

createCluster.RonDB = &api.RonDBConfiguration{
AllInOne: false,
Configuration: api.RonDBBaseConfiguration{
NdbdDefault: api.RonDBNdbdDefaultConfiguration{
ReplicationFactor: replicationFactor,
Expand All @@ -1374,15 +1382,18 @@ func createClusterBaseRequest(d *schema.ResourceData) (*api.CreateCluster, error

if n, ok := d.GetOk("rondb.0.api_nodes"); ok {
createCluster.RonDB.APINodes = structure.ExpandRonDBNodeConfiguration(n.([]interface{})[0].(map[string]interface{}))
} else {
createCluster.RonDB.APINodes = api.RonDBNodeConfiguration{
NodeConfiguration: api.NodeConfiguration{
DiskSize: defaultRonDB.APINodes.DiskSize,
},
Count: 0,
}
}

if createCluster.RonDB.DataNodes.Count%createCluster.RonDB.Configuration.NdbdDefault.ReplicationFactor != 0 {
return nil, fmt.Errorf("number of RonDB data nodes must be multiples of RonDB replication factor")
}

if createCluster.RonDB.IsSingleNodeSetup() {
return nil, fmt.Errorf("your configuration creates a single rondb node, you should use singe_node configuration block instead or modifiy the configuration to run RonDB in a cluster mode")
}
}
}

Expand Down
112 changes: 8 additions & 104 deletions hopsworksai/resource_cluster_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2161,14 +2161,6 @@ func TestClusterCreate_RonDB_invalidReplicationFactor(t *testing.T) {
testClusterCreate_RonDB_invalidReplicationFactor(t, api.AZURE)
}

func TestClusterCreate_AWS_RonDB_cluster_with_single_node_config(t *testing.T) {
testClusterCreate_RonDB_cluster_with_single_node_config(t, api.AWS)
}

func TestClusterCreate_AZURE_RonDB_cluster_with_single_node_config(t *testing.T) {
testClusterCreate_RonDB_cluster_with_single_node_config(t, api.AZURE)
}

func testClusterCreate_RonDB(t *testing.T, cloud api.CloudProvider) {
state := map[string]interface{}{
"name": "cluster",
Expand Down Expand Up @@ -2337,102 +2329,6 @@ func testClusterCreate_RonDB(t *testing.T, cloud api.CloudProvider) {
r.Apply(t, context.TODO())
}

func testClusterCreate_RonDB_cluster_with_single_node_config(t *testing.T, cloud api.CloudProvider) {
state := map[string]interface{}{
"name": "cluster",
"head": []interface{}{
map[string]interface{}{
"disk_size": 512,
},
},
"ssh_key": "my-key",
"workers": []interface{}{
map[string]interface{}{
"disk_size": 256,
"count": 2,
},
},
"rondb": []interface{}{
map[string]interface{}{
"configuration": []interface{}{
map[string]interface{}{
"ndbd_default": []interface{}{
map[string]interface{}{
"replication_factor": 1,
},
},
"general": []interface{}{
map[string]interface{}{
"benchmark": []interface{}{
map[string]interface{}{
"grant_user_privileges": false,
},
},
},
},
},
},
"management_nodes": []interface{}{
map[string]interface{}{
"instance_type": "mgm-node-1",
"disk_size": 30,
"count": 1,
},
},
"data_nodes": []interface{}{
map[string]interface{}{
"instance_type": "data-node-1",
"disk_size": 512,
"count": 1,
},
},
"mysql_nodes": []interface{}{
map[string]interface{}{
"instance_type": "mysqld-node-1",
"disk_size": 100,
"count": 1,
},
},
},
},
}

if cloud == api.AWS {
state["aws_attributes"] = []interface{}{
map[string]interface{}{
"region": "region-1",
"bucket": []interface{}{
map[string]interface{}{
"name": "bucket-1",
},
},
"instance_profile_arn": "profile-1",
},
}
} else if cloud == api.AZURE {
state["azure_attributes"] = []interface{}{
map[string]interface{}{
"location": "location-1",
"resource_group": "resource-group-1",
"user_assigned_managed_identity": "user-identity-1",
"container": []interface{}{
map[string]interface{}{
"storage_account": "storage-account-1",
},
},
},
}
}

r := test.ResourceFixture{
Resource: clusterResource(),
OperationContextFunc: clusterResource().CreateContext,
State: state,
ExpectError: "your configuration creates a single rondb node, you should use singe_node configuration block instead or modifiy the configuration to run RonDB in a cluster mode",
}
r.Apply(t, context.TODO())
}

func testGetRonDBConfig(reqBody io.Reader, cloud api.CloudProvider) (*api.RonDBConfiguration, error) {
var output *api.RonDBConfiguration
if cloud == api.AZURE {
Expand Down Expand Up @@ -2524,6 +2420,7 @@ func testClusterCreate_RonDB_single_node(t *testing.T, cloud api.CloudProvider)
}
defaultRonDB := defaultRonDBConfiguration()
expected := api.RonDBConfiguration{
AllInOne: true,
Configuration: api.RonDBBaseConfiguration{
NdbdDefault: api.RonDBNdbdDefaultConfiguration{
ReplicationFactor: 1,
Expand All @@ -2541,6 +2438,12 @@ func testClusterCreate_RonDB_single_node(t *testing.T, cloud api.CloudProvider)
},
Count: 1,
},
APINodes: api.RonDBNodeConfiguration{
NodeConfiguration: api.NodeConfiguration{
DiskSize: defaultRonDB.APINodes.DiskSize,
},
Count: 0,
},
DataNodes: api.RonDBNodeConfiguration{
NodeConfiguration: api.NodeConfiguration{
InstanceType: "single-node-1",
Expand Down Expand Up @@ -5740,6 +5643,7 @@ func TestClusterUpdate_modifyInstancetype_rondb_single_node(t *testing.T) {
"provider": "AZURE",
"version": "v1",
"ronDB": {
"allInOne": true,
"configuration": {
"ndbdDefault": {
"replicationFactor": 1
Expand Down

0 comments on commit 4a37712

Please sign in to comment.