Merge branch 'working' into job_peek_lchen
job_peek_lchen: Add fetchfile feature (job output/error peek proxy) working: HA/Raft infrastructure (consensus, replication, config mgmt) Conflict resolution summary: - controller.capnp: fetchfile @41, fetchfilereply @18, fetchfilemsg @30 - cluster.c: bifurcated OPCode_reply for fetchfile + config-push ACK - job.c: kept full fetchfile pending-request subsystem (~183 lines) - request.c: kept both xce_fetchfile_req() and XCE_RETRY_DEFAULTS - helper.c: added missing preVoteRequest/preVoteReply mappings - All 15 new test registrations (test_cbuf.c + 14 HA tests)
This commit is contained in:
commit
3a2094a461
529 changed files with 345174 additions and 5048 deletions
|
|
@ -4,7 +4,6 @@ import (
|
|||
"apiserver/models"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"time"
|
||||
)
|
||||
|
||||
// JobID bit layout constants — mirrors src/include/config.h.
|
||||
|
|
@ -155,6 +154,7 @@ type rawWorkerData struct {
|
|||
maxSwap int
|
||||
maxTmp int
|
||||
nDisks int
|
||||
resvals []models.ResourceDistributionInfo
|
||||
}
|
||||
|
||||
// rawQueueData mirrors the C xce_queue_t fields used by the Go model.
|
||||
|
|
@ -207,18 +207,10 @@ func rawJobToModel(r rawJobData) *models.JobInfo {
|
|||
info.ExecUser = si.execUser
|
||||
}
|
||||
}
|
||||
if r.subTime > 0 {
|
||||
info.SubmitTime = time.Unix(r.subTime, 0)
|
||||
}
|
||||
if r.queueTime > 0 {
|
||||
info.QueueTime = time.Unix(r.queueTime, 0)
|
||||
}
|
||||
if r.startTime > 0 {
|
||||
info.StartTime = time.Unix(r.startTime, 0)
|
||||
}
|
||||
if r.finishTime > 0 {
|
||||
info.EndTime = time.Unix(r.finishTime, 0)
|
||||
}
|
||||
info.SubmitTime = r.subTime
|
||||
info.QueueTime = r.queueTime
|
||||
info.StartTime = r.startTime
|
||||
info.EndTime = r.finishTime
|
||||
if len(r.execHosts) > 0 {
|
||||
type hostSlot struct {
|
||||
HostName string `json:"host_name"`
|
||||
|
|
@ -241,8 +233,9 @@ func rawJobToModel(r rawJobData) *models.JobInfo {
|
|||
// rawWorkerToModel maps a rawWorkerData to a models.HostInfo.
|
||||
func rawWorkerToModel(r rawWorkerData) *models.HostInfo {
|
||||
info := &models.HostInfo{
|
||||
HostName: r.name,
|
||||
HostStatus: r.status,
|
||||
HostName: r.name,
|
||||
HostStatus: r.status,
|
||||
ResourceValues: r.resvals,
|
||||
}
|
||||
if r.hasAttrs {
|
||||
info.HostType = r.hostType
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue