vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #663 from runcom/fix-arch-goos

Browse source 
oci: fix type mismatch on some platform/arch
This commit is contained in:
Mrunal Patel 2017-07-17 09:55:22 -07:00 committed by GitHub
commit 2fcc6d574b
3 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
oci/finished.go Normal file
View file

@ -0,0 +1,14 @@
// +build !arm !386
package oci
import (
"os"
"syscall"
"time"
)
func getFinishedTime(fi os.FileInfo) time.Time {
st := fi.Sys().(*syscall.Stat_t)
return time.Unix(st.Ctim.Sec, st.Ctim.Nsec)
}

14
oci/finished_32.go Normal file
View file

@ -0,0 +1,14 @@
// +build arm 386
package oci
import (
"os"
"syscall"
"time"
)
func getFinishedTime(fi os.FileInfo) time.Time {
st := fi.Sys().(*syscall.Stat_t)
return time.Unix(int64(st.Ctim.Sec), int64(st.Ctim.Nsec))
}

4
oci/oci.go
View file

@ -585,9 +585,7 @@ func (r *Runtime) UpdateStatus(c *Container) error {
logrus.Warnf("failed to find container exit file: %v", err)
c.state.ExitCode = -1
} else {
st := fi.Sys().(*syscall.Stat_t)
c.state.Finished = time.Unix(st.Ctim.Sec, st.Ctim.Nsec)
c.state.Finished = getFinishedTime(fi)
statusCodeStr, err := ioutil.ReadFile(exitFilePath)
if err != nil {
return fmt.Errorf("failed to read exit file: %v", err)