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

KO-165: Added SC ignorable namespaces #28

Merged
merged 5 commits into from
Oct 3, 2023
Merged

KO-165: Added SC ignorable namespaces #28

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9eb02bd
Added SC ignorable namespaces
abhishekdwivedi3060 Jul 10, 2023
a5247ec
Merge branch 'master' into KO-165
abhishekdwivedi3060 Aug 14, 2023
b1cf6d4
Merge branch 'master' into KO-165
abhishekdwivedi3060 Sep 14, 2023
58c99a4
Resolved review comments
abhishekdwivedi3060 Sep 14, 2023
88e04dc
Merge branch 'master' into KO-165
abhishekdwivedi3060 Oct 3, 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
19 changes: 12 additions & 7 deletions deployment/strong_consistency.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"strings"

"github.com/go-logr/logr"
"k8s.io/apimachinery/pkg/util/sets"

as "github.com/aerospike/aerospike-client-go/v6"
)
Expand All @@ -18,8 +19,8 @@ const (
nsKeyStrongConsistency = "strong-consistency"
)

func GetAndSetRoster(log logr.Logger, hostConns []*HostConn, policy *as.ClientPolicy, rosterNodeBlockList,
removedNamespaces []string) error {
func GetAndSetRoster(log logr.Logger, hostConns []*HostConn, policy *as.ClientPolicy, rosterNodeBlockList []string,
ignorableNamespaces sets.Set[string]) error {
log.Info("Check if we need to Get and Set roster for SC namespaces")

clHosts, err := getHostsFromHostConns(hostConns, policy)
Expand All @@ -39,7 +40,7 @@ func GetAndSetRoster(log logr.Logger, hostConns []*HostConn, policy *as.ClientPo

// Removed namespaces should not be validated, as it will fail when namespace will be available in nodes
// fewer than replication-factor
if err := validateSCClusterNsState(scNamespacesPerHost, removedNamespaces); err != nil {
if err := validateSCClusterNsState(scNamespacesPerHost, ignorableNamespaces); err != nil {
return fmt.Errorf("cluster namespace state not good, can not set roster: %v", err)
}

Expand All @@ -51,6 +52,10 @@ func GetAndSetRoster(log logr.Logger, hostConns []*HostConn, policy *as.ClientPo
}

for _, scNs := range nsList {
if ignorableNamespaces.Has(scNs) {
continue
}

rosterNodes, err := getRoster(clHost, scNs)
if err != nil {
return err
Expand Down Expand Up @@ -109,7 +114,7 @@ func setFilteredRosterNodes(clHost *host, scNs string, rosterNodes map[string]st
}

func ValidateSCClusterState(log logr.Logger, hostConns []*HostConn, policy *as.ClientPolicy,
removedNamespaces []string) error {
ignorableNamespaces sets.Set[string]) error {
clHosts, err := getHostsFromHostConns(hostConns, policy)
if err != nil {
return err
Expand All @@ -125,7 +130,7 @@ func ValidateSCClusterState(log logr.Logger, hostConns []*HostConn, policy *as.C
return nil
}

return validateSCClusterNsState(scNamespacesPerHost, removedNamespaces)
return validateSCClusterNsState(scNamespacesPerHost, ignorableNamespaces)
}

func getSCNamespaces(clHosts []*host) (scNamespacesPerHost map[*host][]string, isClusterSCEnabled bool, err error) {
Expand Down Expand Up @@ -168,14 +173,14 @@ func runRecluster(clHosts []*host) error {
return nil
}

func validateSCClusterNsState(scNamespacesPerHost map[*host][]string, removedNamespaces []string) error {
func validateSCClusterNsState(scNamespacesPerHost map[*host][]string, ignorableNamespaces sets.Set[string]) error {
for clHost, nsList := range scNamespacesPerHost {
clHost.log.Info("Validate SC enabled Cluster namespace State. Looking for unavailable or dead partitions",
"namespaces", nsList)

for _, ns := range nsList {
// NS is getting removed from nodes. This may lead to unavailable partitions. Therefor skip the check for this NS
if containsString(removedNamespaces, ns) {
if ignorableNamespaces.Has(ns) {
continue
}

Expand Down