a/seaweedfs-operator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11 from howardlau1999/filerpeer

Browse Source 
Support Filer Peers
This commit is contained in:
Chris Lu 2020-10-30 02:55:13 -07:00 committed by GitHub
commit 740ac81a57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
controllers/controller_filer_statefulset.go
View File

@ -16,6 +16,7 @@ func buildFilerStartupScript(m *seaweedv1.Seaweed) string {
commands := []string{"weed", "filer"} commands := []string{"weed", "filer"}
commands = append(commands, fmt.Sprintf("-port=%d", seaweedv1.FilerHTTPPort)) commands = append(commands, fmt.Sprintf("-port=%d", seaweedv1.FilerHTTPPort))
commands = append(commands, fmt.Sprintf("-ip=$(POD_NAME).%s-filer-peer", m.Name)) commands = append(commands, fmt.Sprintf("-ip=$(POD_NAME).%s-filer-peer", m.Name))
commands = append(commands, fmt.Sprintf("-peers=%s", getFilerPeersString(m.Name, m.Spec.Volume.Replicas)))
commands = append(commands, fmt.Sprintf("-master=%s", getMasterPeersString(m.Name, m.Spec.Master.Replicas))) commands = append(commands, fmt.Sprintf("-master=%s", getMasterPeersString(m.Name, m.Spec.Master.Replicas)))
commands = append(commands, "-s3") commands = append(commands, "-s3")

14
controllers/helper.go
View File

@ -10,6 +10,7 @@ import (
const ( const (
masterPeerAddressPattern = "%s-master-%d.%s-master-peer:9333" masterPeerAddressPattern = "%s-master-%d.%s-master-peer:9333"
filerPeerAddressPattern = "%s-filer-%d.%s-filer-peer:8888"
masterPeerAddressWithNamespacePattern = "%s-master-%d.%s-master-peer.%s:9333" masterPeerAddressWithNamespacePattern = "%s-master-%d.%s-master-peer.%s:9333"
filerServiceAddressWithNamespacePattern = "%s-filer.%s:8888" filerServiceAddressWithNamespacePattern = "%s-filer.%s:8888"
masterServiceAddressWithNamespacePattern = "%s-master.%s:9333" masterServiceAddressWithNamespacePattern = "%s-master.%s:9333"
@ -51,6 +52,18 @@ func ReconcileResult(err error) (bool, ctrl.Result, error) {
return false, ctrl.Result{}, nil return false, ctrl.Result{}, nil
} }
func getFilerAddresses(name string, replicas int32) []string {
peersAddresses := make([]string, 0, replicas)
for i := int32(0); i < replicas; i++ {
peersAddresses = append(peersAddresses, fmt.Sprintf(filerPeerAddressPattern, name, i, name))
}
return peersAddresses
}
func getFilerPeersString(name string, replicas int32) string {
return strings.Join(getFilerAddresses(name, replicas), ",")
}
func getMasterAddresses(name string, replicas int32) []string { func getMasterAddresses(name string, replicas int32) []string {
peersAddresses := make([]string, 0, replicas) peersAddresses := make([]string, 0, replicas)
for i := int32(0); i < replicas; i++ { for i := int32(0); i < replicas; i++ {
@ -62,6 +75,7 @@ func getMasterAddresses(name string, replicas int32) []string {
func getMasterPeersString(name string, replicas int32) string { func getMasterPeersString(name string, replicas int32) string {
return strings.Join(getMasterAddresses(name, replicas), ",") return strings.Join(getMasterAddresses(name, replicas), ",")
} }
func getMasterAddressesWithNamespace(name, namespace string, replicas int32) []string { func getMasterAddressesWithNamespace(name, namespace string, replicas int32) []string {
peersAddresses := make([]string, 0, replicas) peersAddresses := make([]string, 0, replicas)
for i := int32(0); i < replicas; i++ { for i := int32(0); i < replicas; i++ {