Skip to content

Commit

Permalink
use inc-engine/recompute instead of deprecated recompute (#1528)
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangzujian committed May 14, 2022
1 parent 1209476 commit bcdb338
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 11 deletions.
8 changes: 8 additions & 0 deletions pkg/daemon/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"os/exec"
"strconv"
"time"

Expand Down Expand Up @@ -684,3 +685,10 @@ func (c *Controller) Run(stopCh <-chan struct{}) {
<-stopCh
klog.Info("Shutting down workers")
}

func recompute() {
output, err := exec.Command("ovn-appctl", "-t", "ovn-controller", "inc-engine/recompute").CombinedOutput()
if err != nil {
klog.Errorf("failed to recompute ovn-controller %q", output)
}
}
7 changes: 0 additions & 7 deletions pkg/daemon/controller_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -744,10 +744,3 @@ func isFile(filename string, dir string) (bool, string) {
}
return isFile, fileFullName
}

func recompute() {
output, err := exec.Command("ovn-appctl", "-t", "ovn-controller", "recompute").CombinedOutput()
if err != nil {
klog.Errorf("failed to recompute ovn-controller %q", output)
}
}
4 changes: 0 additions & 4 deletions pkg/daemon/controller_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,3 @@ func rotateLog() {

func (c *Controller) operateMod() {
}

func recompute() {
// FIXME: do not execute recompute to decrease possibility of ovs stuckness
}

0 comments on commit bcdb338

Please sign in to comment.