Skip to content

[odc] plumbing for expendable and rmsjobid in odcdevice #701

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
knopers8 merged 1 commit into from
May 5, 2025
Merged

[odc] plumbing for expendable and rmsjobid in odcdevice #701

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
30 changes: 19 additions & 11 deletions core/integration/odc/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,14 @@ type OdcPartitionInfo struct {
}

type OdcDevice struct {
TaskId string `json:"taskId"`
State string `json:"state"`
EcsState sm.State `json:"ecsState"`
Path string `json:"path"`
Ignored bool `json:"ignored"`
Host string `json:"host"`
TaskId string `json:"taskId"`
State string `json:"state"`
EcsState sm.State `json:"ecsState"`
Path string `json:"path"`
Ignored bool `json:"ignored"`
Host string `json:"host"`
Expendable bool `json:"expendable"`
Rmsjobid string `json:"rmsjobid"`
}

type partitionStateChangedEventPayload struct {
Expand All @@ -136,6 +138,8 @@ type deviceStateChangedEventPayload struct {
Path string `json:"path"`
Ignored bool `json:"ignored"`
Host string `json:"host"`
Expendable bool `json:"expendable"`
Rmsjobid string `json:"rmsjobid"`
}

func NewPlugin(endpoint string) integration.Plugin {
Expand Down Expand Up @@ -258,11 +262,13 @@ func (p *Plugin) queryPartitionStatus() {
odcPartInfoSlice[idx].Devices = make(map[OdcDeviceId]*OdcDevice, len(odcPartStateRep.Devices))
for _, device := range odcPartStateRep.Devices {
odcPartInfoSlice[idx].Devices[OdcDeviceId(device.Id)] = &OdcDevice{
TaskId: strconv.FormatUint(device.Id, 10),
State: device.State,
Path: device.Path,
Ignored: device.Ignored,
Host: device.Host,
TaskId: strconv.FormatUint(device.Id, 10),
State: device.State,
Path: device.Path,
Ignored: device.Ignored,
Host: device.Host,
Expendable: device.Expendable,
Rmsjobid: device.Rmsjobid,
}
}
}(i, id)
Expand Down Expand Up @@ -317,6 +323,8 @@ func (p *Plugin) queryPartitionStatus() {
Path: device.Path,
Ignored: device.Ignored,
Host: device.Host,
Expendable: device.Expendable,
Rmsjobid: device.Rmsjobid,
}
payloadJson, _ := json.Marshal(payload)

Expand Down