Skip to content

Commit

Permalink
multiregion: allow empty region DCs (#8426)
Browse files Browse the repository at this point in the history
It's supposed to be possible for a region not to have `datacenters` set so
that it can use the job's `datacenters` field. This requires that operators
use the same DC name across multiple regions, but that's the default client
configuration.
  • Loading branch information
tgross committed Jul 13, 2020
1 parent f6f697a commit 3dd2995
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions nomad/structs/structs.go
Original file line number Diff line number Diff line change
Expand Up @@ -4034,7 +4034,7 @@ func (j *Job) Validate() error {
}

if j.IsMultiregion() {
if err := j.Multiregion.Validate(j.Type); err != nil {
if err := j.Multiregion.Validate(j.Type, j.Datacenters); err != nil {
mErr.Errors = append(mErr.Errors, err)
}
}
Expand Down Expand Up @@ -4600,7 +4600,7 @@ func (m *Multiregion) Copy() *Multiregion {
return copy
}

func (m *Multiregion) Validate(jobType string) error {
func (m *Multiregion) Validate(jobType string, jobDatacenters []string) error {
var mErr multierror.Error
seen := map[string]struct{}{}
for _, region := range m.Regions {
Expand All @@ -4610,7 +4610,7 @@ func (m *Multiregion) Validate(jobType string) error {
region.Name))
}
seen[region.Name] = struct{}{}
if len(region.Datacenters) == 0 {
if len(region.Datacenters) == 0 && len(jobDatacenters) == 0 {
mErr.Errors = append(mErr.Errors,
fmt.Errorf("Multiregion region %q must have at least 1 datacenter",
region.Name),
Expand Down
2 changes: 1 addition & 1 deletion nomad/structs/structs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5609,7 +5609,7 @@ func TestMultiregion_Validate(t *testing.T) {

for _, tc := range cases {
t.Run(tc.Name, func(t *testing.T) {
err := tc.Case.Validate(tc.JobType)
err := tc.Case.Validate(tc.JobType, []string{})
if len(tc.Errors) == 0 {
require.NoError(err)
} else {
Expand Down

0 comments on commit 3dd2995

Please sign in to comment.