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

Jump to bottom

Fixed MCM restart during cleanup #879

Merged
merged 3 commits into from
Dec 12, 2023
Merged

Fixed MCM restart during cleanup #879

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e195cd9
Fixed MCM restart during cleanup
sssash18 Dec 11, 2023
35ecef4
quick fix
sssash18 Dec 11, 2023
6300bf9
Addressed review comments
sssash18 Dec 12, 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
44 changes: 35 additions & 9 deletions pkg/test/integration/common/framework.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,13 @@ func (c *IntegrationTestFramework) setupMachineClass() error {

// rotateLogFile takes file name as input and returns a file object obtained by os.Create
// If the file exists already then it renames it so that a new file can be created
func rotateLogFile(fileName string) (*os.File, error) {
func rotateOrAppendLogFile(fileName string, shouldRotate bool) (*os.File, error) {
if !shouldRotate {
if _, err := os.Stat(fileName); os.IsNotExist(err) {
return os.Create(fileName)
}
return os.OpenFile(fileName, os.O_APPEND|os.O_WRONLY, 0600)
}
if _, err := os.Stat(fileName); err == nil { // !strings.Contains(err.Error(), "no such file or directory") {
noOfFiles := 0
temp := fileName + "." + strconv.Itoa(noOfFiles+1)
Expand Down Expand Up @@ -728,7 +734,7 @@ func (c *IntegrationTestFramework) runControllersLocally() {
c.TargetCluster.KubeConfigFilePath,
controlClusterNamespace),
)
outputFile, err := rotateLogFile(mcLogFile)
outputFile, err := rotateOrAppendLogFile(mcLogFile, true)
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
mcsession, err = gexec.Start(exec.Command(args[0], args[1:]...), outputFile, outputFile)
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
Expand All @@ -743,7 +749,7 @@ func (c *IntegrationTestFramework) runControllersLocally() {
c.TargetCluster.KubeConfigFilePath,
controlClusterNamespace),
)
outputFile, err = rotateLogFile(mcmLogFile)
outputFile, err = rotateOrAppendLogFile(mcmLogFile, true)
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
mcmsession, err = gexec.Start(exec.Command(args[0], args[1:]...), outputFile, outputFile)
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
Expand Down Expand Up @@ -1039,9 +1045,9 @@ func (c *IntegrationTestFramework) ControllerTests() {
if mcsession == nil {
// controllers running in pod
// Create log file from container log
mcmOutputFile, err := rotateLogFile(mcmLogFile)
mcmOutputFile, err := rotateOrAppendLogFile(mcmLogFile, true)
gomega.Expect(err).NotTo(gomega.HaveOccurred())
mcOutputFile, err := rotateLogFile(mcLogFile)
mcOutputFile, err := rotateOrAppendLogFile(mcLogFile, true)
gomega.Expect(err).NotTo(gomega.HaveOccurred())
ginkgo.By("Reading container log is leading to no errors")
podList, err := c.ControlCluster.Clientset.
Expand Down Expand Up @@ -1219,9 +1225,19 @@ func (c *IntegrationTestFramework) Cleanup() {
for i := 0; i < 5; i++ {
if mcsession.ExitCode() != -1 {
ginkgo.By("Restarting Machine Controller ")
outputFile, err := rotateLogFile(mcLogFile)
outputFile, err := rotateOrAppendLogFile(mcLogFile, false)
gomega.Expect(err).NotTo(gomega.HaveOccurred())
_, err = outputFile.WriteString("\n------------RESTARTED MC------------\n")
gomega.Expect(err).NotTo(gomega.HaveOccurred())
_, err = gexec.Start(mcsession.Command, outputFile, outputFile)
args := strings.Fields(
fmt.Sprintf(
"make --directory=%s start CONTROL_KUBECONFIG=%s TARGET_KUBECONFIG=%s CONTROL_NAMESPACE=%s LEADER_ELECT=false ",
"../../..",
c.ControlCluster.KubeConfigFilePath,
c.TargetCluster.KubeConfigFilePath,
controlClusterNamespace),
)
mcsession, err = gexec.Start(exec.Command(args[0], args[1:]...), outputFile, outputFile)
gomega.Expect(err).NotTo(gomega.HaveOccurred())
break
}
Expand All @@ -1230,9 +1246,19 @@ func (c *IntegrationTestFramework) Cleanup() {
for i := 0; i < 5; i++ {
if mcmsession.ExitCode() != -1 {
ginkgo.By("Restarting Machine Controller Manager")
outputFile, err := rotateLogFile(mcmLogFile)
outputFile, err := rotateOrAppendLogFile(mcmLogFile, false)
gomega.Expect(err).NotTo(gomega.HaveOccurred())
_, err = outputFile.WriteString("\n------------RESTARTED MCM------------\n")
gomega.Expect(err).NotTo(gomega.HaveOccurred())
_, err = gexec.Start(mcmsession.Command, outputFile, outputFile)
args := strings.Fields(
fmt.Sprintf(
"make --directory=%s start CONTROL_KUBECONFIG=%s TARGET_KUBECONFIG=%s CONTROL_NAMESPACE=%s LEADER_ELECT=false MACHINE_SAFETY_OVERSHOOTING_PERIOD=300ms",
mcmRepoPath,
c.ControlCluster.KubeConfigFilePath,
c.TargetCluster.KubeConfigFilePath,
controlClusterNamespace),
)
mcmsession, err = gexec.Start(exec.Command(args[0], args[1:]...), outputFile, outputFile)
gomega.Expect(err).NotTo(gomega.HaveOccurred())
break
}
Expand Down