From c8f496638921234db7c0f18262afcd70947b7e61 Mon Sep 17 00:00:00 2001
From: Jackson Owens <jackson@cockroachlabs.com>
Date: Wed, 25 Sep 2024 11:33:35 -0400
Subject: [PATCH] storage: remove WAL failover enterprise license check

The license check may be performed before the node has fully initialized and
knows whether a valid enterprise license is available. A warning may be logged
erroneously, which may confuse. Remove the license check altogether given the
direction CockroachDB enterprise licensing is moving in general.

Epic: none
Informs #129240.
Release note: none
---
 pkg/storage/open.go                      | 9 +--------
 pkg/storage/open_test.go                 | 5 -----
 pkg/storage/testdata/wal_failover_config | 8 --------
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/pkg/storage/open.go b/pkg/storage/open.go
index 8387f12b9f73..91eb591f4625 100644
--- a/pkg/storage/open.go
+++ b/pkg/storage/open.go
@@ -22,7 +22,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/storage/fs"
-	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/errors"
 	"github.com/cockroachdb/pebble"
 	"github.com/cockroachdb/pebble/vfs"
@@ -439,7 +438,6 @@ func WALFailover(walCfg base.WALFailoverConfig, storeEnvs fs.Envs, defaultFS vfs
 func makePebbleWALFailoverOptsForDir(
 	settings *cluster.Settings, dir wal.Dir,
 ) *pebble.WALFailoverOptions {
-	cclWALFailoverLogEvery := log.Every(10 * time.Minute)
 	return &pebble.WALFailoverOptions{
 		Secondary: dir,
 		FailoverOptions: wal.FailoverOptions{
@@ -455,12 +453,7 @@ func makePebbleWALFailoverOptsForDir(
 				// NB: We do not use settings.Version.IsActive because we do not have a
 				// guarantee that the cluster version has been initialized.
 				versionOK := settings.Version.ActiveVersionOrEmpty(context.TODO()).IsActive(clusterversion.V24_1Start)
-				// WAL failover is a licensed feature.
-				licenseOK := base.CCLDistributionAndEnterpriseEnabled(settings)
-				if !licenseOK && cclWALFailoverLogEvery.ShouldLog() {
-					log.Warningf(context.Background(), "Ignoring WAL failover configuration because it requires an enterprise license.")
-				}
-				return walFailoverUnhealthyOpThreshold.Get(&settings.SV), versionOK && licenseOK
+				return walFailoverUnhealthyOpThreshold.Get(&settings.SV), versionOK
 			},
 		},
 	}
diff --git a/pkg/storage/open_test.go b/pkg/storage/open_test.go
index a8e1994215e7..7592d7675e1d 100644
--- a/pkg/storage/open_test.go
+++ b/pkg/storage/open_test.go
@@ -124,11 +124,6 @@ func TestWALFailover(t *testing.T) {
 				}
 				settings := cluster.MakeTestingClusterSettingsWithVersions(version, version, true /* initializeVersion */)
 
-				// Mock an enterpise license, or not if disable-enterprise is specified.
-				enterpriseEnabledFunc := base.CCLDistributionAndEnterpriseEnabled
-				base.CCLDistributionAndEnterpriseEnabled = func(st *cluster.Settings) bool { return !td.HasArg("disable-enterprise") }
-				defer func() { base.CCLDistributionAndEnterpriseEnabled = enterpriseEnabledFunc }()
-
 				engine, err := Open(context.Background(), openEnv, settings, WALFailover(cfg, envs, defaultFS))
 				if err != nil {
 					openEnv.Close()
diff --git a/pkg/storage/testdata/wal_failover_config b/pkg/storage/testdata/wal_failover_config
index b027464db03c..3e0ae0ce52aa 100644
--- a/pkg/storage/testdata/wal_failover_config
+++ b/pkg/storage/testdata/wal_failover_config
@@ -102,14 +102,6 @@ open flag=disabled envs=(foo,bar) open=bar
 OK
 WALRecoveryDir: foo/auxiliary/wals-among-stores
 
-# Ensure that WAL failover refuses to failover if there's no enterprise
-# license configured.
-open flag=among-stores envs=(foo,bar) open=foo disable-enterprise
-----
-OK
-secondary = bar/auxiliary/wals-among-stores
-UnhealthyOperationLatencyThreshold() = (100ms,false)
-
 open flag=disabled envs=(foo,bar) open=foo
 ----
 OK