github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #59713 from hanxiaoshuai/fix0211

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 60208, 60084, 60183, 59713, 60096). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Use SeekStart, SeekCurrent, and SeekEnd repalace of deprecated constant

**What this PR does / why we need it**:
Use SeekStart, SeekCurrent, and SeekEnd repalace of deprecated constant.
'''
// Deprecated: Use io.SeekStart, io.SeekCurrent, and io.SeekEnd.
const (
	SEEK_SET int = 0 // seek relative to the origin of the file
	SEEK_CUR int = 1 // seek relative to the current offset
	SEEK_END int = 2 // seek relative to the end
)

'''
**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-02-22 23:17:38 -08:00 committed by GitHub
commit f05a065738
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/kuberuntime/logs/logs.go
View File

@ -278,7 +278,7 @@ func ReadLogs(path, containerID string, opts *LogOptions, runtimeService interna
if err != nil { if err != nil {
return fmt.Errorf("failed to tail %d lines of log file %q: %v", opts.tail, path, err) return fmt.Errorf("failed to tail %d lines of log file %q: %v", opts.tail, path, err)
} }
if _, err := f.Seek(start, os.SEEK_SET); err != nil { if _, err := f.Seek(start, io.SeekStart); err != nil {
return fmt.Errorf("failed to seek %d in log file %q: %v", start, path, err) return fmt.Errorf("failed to seek %d in log file %q: %v", start, path, err)
} }
@ -303,7 +303,7 @@ func ReadLogs(path, containerID string, opts *LogOptions, runtimeService interna
if opts.follow { if opts.follow {
// Reset seek so that if this is an incomplete line, // Reset seek so that if this is an incomplete line,
// it will be read again. // it will be read again.
if _, err := f.Seek(-int64(len(l)), os.SEEK_CUR); err != nil { if _, err := f.Seek(-int64(len(l)), io.SeekCurrent); err != nil {
return fmt.Errorf("failed to reset seek in log file %q: %v", path, err) return fmt.Errorf("failed to reset seek in log file %q: %v", path, err)
} }
if watcher == nil { if watcher == nil {

6
pkg/util/tail/tail.go
View File

@ -53,7 +53,7 @@ func ReadAtMost(path string, max int64) ([]byte, bool, error) {
if size < max { if size < max {
max = size max = size
} }
offset, err := f.Seek(-max, os.SEEK_END) offset, err := f.Seek(-max, io.SeekEnd)
if err != nil { if err != nil {
return nil, false, err return nil, false, err
} }
@ -70,7 +70,7 @@ func FindTailLineStartIndex(f io.ReadSeeker, n int64) (int64, error) {
if n < 0 { if n < 0 {
return 0, nil return 0, nil
} }
size, err := f.Seek(0, os.SEEK_END) size, err := f.Seek(0, io.SeekEnd)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@ -82,7 +82,7 @@ func FindTailLineStartIndex(f io.ReadSeeker, n int64) (int64, error) {
left = 0 left = 0
buf = make([]byte, right) buf = make([]byte, right)
} }
if _, err := f.Seek(left, os.SEEK_SET); err != nil { if _, err := f.Seek(left, io.SeekStart); err != nil {
return 0, err return 0, err
} }
if _, err := f.Read(buf); err != nil { if _, err := f.Read(buf); err != nil {