Skip to content

OCPBUGS-72419: Ensure phc2sys commandline is properly concatenated #526

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

Merged
openshift-merge-bot merged 1 commit into from
Jan 12, 2026
Merged

OCPBUGS-72419: Ensure phc2sys commandline is properly concatenated #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pkg/daemon/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,7 +1129,7 @@ func (dn *Daemon) ApplyHaProfiles(nodeProfile *ptpv1.PtpProfile, cmdLine string)
}
}
if len(updateHaProfileToSocketPath) > 0 {
cmdLine = fmt.Sprintf("%s%s", cmdLine, strings.Join(updateHaProfileToSocketPath, " "))
cmdLine = fmt.Sprintf("%s %s", cmdLine, strings.Join(updateHaProfileToSocketPath, " "))
}
glog.Infof(cmdLine)
return haProfiles, cmdLine
Expand Down
16 changes: 8 additions & 8 deletions pkg/daemon/daemon_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@ const (
CLEANUP = -12345678
)

var pm *daemon.ProcessManager
var registry *prometheus.Registry
var logTestCases []synceLogTestCase
var (
pm *daemon.ProcessManager
registry *prometheus.Registry
logTestCases []synceLogTestCase
)

type TestCase struct {
MessageTag string
Expand Down Expand Up @@ -235,6 +237,7 @@ func TestMain(m *testing.M) {
teardown()
os.Exit(code)
}

func Test_ProcessPTPMetrics(t *testing.T) {
leap.MockLeapFile()
defer close(leap.LeapMgr.Close)
Expand Down Expand Up @@ -311,10 +314,9 @@ func TestDaemon_ApplyHaProfiles(t *testing.T) {
processManager.SetTestProfileProcess(*p3.Name, nil, "", "config1", p3)
dd := &daemon.Daemon{}
dd.SetProcessManager(processManager)
haProfiles, cmdLine := dd.ApplyHaProfiles(&p3, "")
assert.NotEmpty(t, cmdLine, "cmdLine is not empty")
haProfiles, cmdLine := dd.ApplyHaProfiles(&p3, "phc2sys")
assert.Equal(t, len(haProfiles), 2, "ha has two profiles")
assert.Equal(t, cmdLine, "-z socket1 -z socket2", "CmdLine is empty")
assert.Equal(t, cmdLine, "phc2sys -z socket1 -z socket2", "CmdLine is empty")
}

var (
Expand All @@ -337,7 +339,6 @@ type synceLogTestCase struct {

func InitSynceLogTestCase() {
logTestCases = []synceLogTestCase{

{
output: "synce4l[1225226.279]: [synce4l.0.config] tx_rebuild_tlv: attached new TLV, QL=0x1 on ens7f0",
expectedState: "",
Expand Down Expand Up @@ -424,7 +425,6 @@ func InitSynceLogTestCase() {
expectedDescription: "Will not produce any output;will use last data ",
},
}

}

func TestDaemon_ProcessSynceLogs(t *testing.T) {
Expand Down