mats/go-cart-actor
1
0
Fork 0
Code Issues Pull Requests 1 Actions 3 Packages Projects Releases Wiki Activity

stuff
Some checks failed
Build and Publish / BuildAndDeploy (push) Has been cancelled
Details

Browse Source
This commit is contained in:
matst80
2024-11-10 14:27:14 +01:00
parent ecc676897a
commit bcf6e6e9c6
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main.go
View File

@@ -135,7 +135,7 @@ func (s *PoolServer) Serve() *http.ServeMux {
return mux return mux
} }
var clientName = os.Getenv("POD_IP") var podIp = os.Getenv("POD_IP")
var name = os.Getenv("POD_NAME") var name = os.Getenv("POD_NAME")
func main() { func main() {
@@ -151,7 +151,7 @@ func main() {
var config *rest.Config var config *rest.Config
var kerr error var kerr error
if clientName == "" { if podIp == "" {
config, kerr = clientcmd.BuildConfigFromFlags("", "/Users/mats/.kube/config") config, kerr = clientcmd.BuildConfigFromFlags("", "/Users/mats/.kube/config")
} else { } else {
config, kerr = rest.InClusterConfig() config, kerr = rest.InClusterConfig()
@@ -165,7 +165,7 @@ func main() {
} }
d := NewK8sDiscovery(client) d := NewK8sDiscovery(client)
syncedPool, err := NewSyncedPool(app.pool, clientName, d) syncedPool, err := NewSyncedPool(app.pool, podIp, d)
if err != nil { if err != nil {
log.Fatalf("Error creating synced pool: %v\n", err) log.Fatalf("Error creating synced pool: %v\n", err)
} }

10
synced-pool.go
View File

@@ -373,13 +373,13 @@ func (r *RemoteHost) ConfirmChange(id CartId, host string) error {
return nil return nil
} }
func (p *SyncedPool) OwnerChanged(id CartId, host string) error { func (p *SyncedPool) RequestOwnership(id CartId) error {
for _, r := range p.remotes { for _, r := range p.remotes {
log.Printf("Confirming change of %s to %s with %s\n", id, host, r.Host) log.Printf("Confirming change of %s to %s (me) with %s\n", id, p.Hostname, r.Host)
err := r.ConfirmChange(id, host) err := r.ConfirmChange(id, p.Hostname)
if err != nil { if err != nil {
log.Printf("Error confirming change: %v from %s\n", err, host) log.Printf("Error confirming change: %v from %s\n", err, p.Hostname)
return err return err
} }
} }
@@ -477,7 +477,7 @@ func (p *SyncedPool) getGrainPool(id CartId) (GrainPool, error) {
remoteLookupCount.Inc() remoteLookupCount.Inc()
return remotePool, nil return remotePool, nil
} }
err := p.OwnerChanged(id, p.Hostname) err := p.RequestOwnership(id)
if err != nil { if err != nil {
return nil, err return nil, err
} }