|
|
|
/*
|
|
|
|
* MinIO Cloud Storage, (C) 2016, 2017 MinIO, Inc.
|
|
|
|
*
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
* You may obtain a copy of the License at
|
|
|
|
*
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
*
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
* limitations under the License.
|
|
|
|
*/
|
|
|
|
|
|
|
|
package cmd
|
|
|
|
|
|
|
|
import (
|
|
|
|
"bytes"
|
|
|
|
"io"
|
|
|
|
"io/ioutil"
|
|
|
|
"os"
|
|
|
|
"path"
|
|
|
|
"testing"
|
|
|
|
|
|
|
|
"github.com/minio/minio/pkg/lock"
|
|
|
|
)
|
|
|
|
|
|
|
|
func TestFSRenameFile(t *testing.T) {
|
|
|
|
// create xlStorage test setup
|
|
|
|
_, path, err := newXLStorageTestSetup()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("Unable to create xlStorage test setup, %s", err)
|
|
|
|
}
|
|
|
|
defer os.RemoveAll(path)
|
|
|
|
|
|
|
|
if err = fsMkdir(GlobalContext, pathJoin(path, "testvolume1")); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if err = fsRenameFile(GlobalContext, pathJoin(path, "testvolume1"), pathJoin(path, "testvolume2")); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if err = fsRenameFile(GlobalContext, pathJoin(path, "testvolume1"), pathJoin(path, "testvolume2")); err != errFileNotFound {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if err = fsRenameFile(GlobalContext, pathJoin(path, "my-obj-del-0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001"), pathJoin(path, "testvolume2")); err != errFileNameTooLong {
|
|
|
|
t.Fatal("Unexpected error", err)
|
|
|
|
}
|
|
|
|
if err = fsRenameFile(GlobalContext, pathJoin(path, "testvolume1"), pathJoin(path, "my-obj-del-0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001")); err != errFileNameTooLong {
|
|
|
|
t.Fatal("Unexpected error", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestFSStats(t *testing.T) {
|
|
|
|
// create xlStorage test setup
|
|
|
|
_, path, err := newXLStorageTestSetup()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("Unable to create xlStorage test setup, %s", err)
|
|
|
|
}
|
|
|
|
defer os.RemoveAll(path)
|
|
|
|
|
|
|
|
// Setup test environment.
|
|
|
|
|
|
|
|
if err = fsMkdir(GlobalContext, ""); err != errInvalidArgument {
|
|
|
|
t.Fatal("Unexpected error", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if err = fsMkdir(GlobalContext, pathJoin(path, "my-obj-del-0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001")); err != errFileNameTooLong {
|
|
|
|
t.Fatal("Unexpected error", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if err = fsMkdir(GlobalContext, pathJoin(path, "success-vol")); err != nil {
|
|
|
|
t.Fatalf("Unable to create volume, %s", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
var reader = bytes.NewReader([]byte("Hello, world"))
|
fix: use buffers only when necessary for io.Copy() (#11229)
Use separate sync.Pool for writes/reads
Avoid passing buffers for io.CopyBuffer()
if the writer or reader implement io.WriteTo or io.ReadFrom
respectively then its useless for sync.Pool to allocate
buffers on its own since that will be completely ignored
by the io.CopyBuffer Go implementation.
Improve this wherever we see this to be optimal.
This allows us to be more efficient on memory usage.
```
385 // copyBuffer is the actual implementation of Copy and CopyBuffer.
386 // if buf is nil, one is allocated.
387 func copyBuffer(dst Writer, src Reader, buf []byte) (written int64, err error) {
388 // If the reader has a WriteTo method, use it to do the copy.
389 // Avoids an allocation and a copy.
390 if wt, ok := src.(WriterTo); ok {
391 return wt.WriteTo(dst)
392 }
393 // Similarly, if the writer has a ReadFrom method, use it to do the copy.
394 if rt, ok := dst.(ReaderFrom); ok {
395 return rt.ReadFrom(src)
396 }
```
From readahead package
```
// WriteTo writes data to w until there's no more data to write or when an error occurs.
// The return value n is the number of bytes written.
// Any error encountered during the write is also returned.
func (a *reader) WriteTo(w io.Writer) (n int64, err error) {
if a.err != nil {
return 0, a.err
}
n = 0
for {
err = a.fill()
if err != nil {
return n, err
}
n2, err := w.Write(a.cur.buffer())
a.cur.inc(n2)
n += int64(n2)
if err != nil {
return n, err
}
```
4 years ago
|
|
|
if _, err = fsCreateFile(GlobalContext, pathJoin(path, "success-vol", "success-file"), reader, 0); err != nil {
|
|
|
|
t.Fatalf("Unable to create file, %s", err)
|
|
|
|
}
|
|
|
|
// Seek back.
|
|
|
|
reader.Seek(0, 0)
|
|
|
|
|
|
|
|
if err = fsMkdir(GlobalContext, pathJoin(path, "success-vol", "success-file")); err != errVolumeExists {
|
|
|
|
t.Fatal("Unexpected error", err)
|
|
|
|
}
|
|
|
|
|
fix: use buffers only when necessary for io.Copy() (#11229)
Use separate sync.Pool for writes/reads
Avoid passing buffers for io.CopyBuffer()
if the writer or reader implement io.WriteTo or io.ReadFrom
respectively then its useless for sync.Pool to allocate
buffers on its own since that will be completely ignored
by the io.CopyBuffer Go implementation.
Improve this wherever we see this to be optimal.
This allows us to be more efficient on memory usage.
```
385 // copyBuffer is the actual implementation of Copy and CopyBuffer.
386 // if buf is nil, one is allocated.
387 func copyBuffer(dst Writer, src Reader, buf []byte) (written int64, err error) {
388 // If the reader has a WriteTo method, use it to do the copy.
389 // Avoids an allocation and a copy.
390 if wt, ok := src.(WriterTo); ok {
391 return wt.WriteTo(dst)
392 }
393 // Similarly, if the writer has a ReadFrom method, use it to do the copy.
394 if rt, ok := dst.(ReaderFrom); ok {
395 return rt.ReadFrom(src)
396 }
```
From readahead package
```
// WriteTo writes data to w until there's no more data to write or when an error occurs.
// The return value n is the number of bytes written.
// Any error encountered during the write is also returned.
func (a *reader) WriteTo(w io.Writer) (n int64, err error) {
if a.err != nil {
return 0, a.err
}
n = 0
for {
err = a.fill()
if err != nil {
return n, err
}
n2, err := w.Write(a.cur.buffer())
a.cur.inc(n2)
n += int64(n2)
if err != nil {
return n, err
}
```
4 years ago
|
|
|
if _, err = fsCreateFile(GlobalContext, pathJoin(path, "success-vol", "path/to/success-file"), reader, 0); err != nil {
|
|
|
|
t.Fatalf("Unable to create file, %s", err)
|
|
|
|
}
|
|
|
|
// Seek back.
|
|
|
|
reader.Seek(0, 0)
|
|
|
|
|
|
|
|
testCases := []struct {
|
|
|
|
srcFSPath string
|
|
|
|
srcVol string
|
|
|
|
srcPath string
|
|
|
|
expectedErr error
|
|
|
|
}{
|
|
|
|
// Test case - 1.
|
|
|
|
// Test case with valid inputs, expected to pass.
|
|
|
|
{
|
|
|
|
srcFSPath: path,
|
|
|
|
srcVol: "success-vol",
|
|
|
|
srcPath: "success-file",
|
|
|
|
expectedErr: nil,
|
|
|
|
},
|
|
|
|
// Test case - 2.
|
|
|
|
// Test case with valid inputs, expected to pass.
|
|
|
|
{
|
|
|
|
srcFSPath: path,
|
|
|
|
srcVol: "success-vol",
|
|
|
|
srcPath: "path/to/success-file",
|
|
|
|
expectedErr: nil,
|
|
|
|
},
|
|
|
|
// Test case - 3.
|
|
|
|
// Test case with non-existent file.
|
|
|
|
{
|
|
|
|
srcFSPath: path,
|
|
|
|
srcVol: "success-vol",
|
|
|
|
srcPath: "nonexistent-file",
|
|
|
|
expectedErr: errFileNotFound,
|
|
|
|
},
|
|
|
|
// Test case - 4.
|
|
|
|
// Test case with non-existent file path.
|
|
|
|
{
|
|
|
|
srcFSPath: path,
|
|
|
|
srcVol: "success-vol",
|
|
|
|
srcPath: "path/2/success-file",
|
|
|
|
expectedErr: errFileNotFound,
|
|
|
|
},
|
|
|
|
// Test case - 5.
|
|
|
|
// Test case with path being a directory.
|
|
|
|
{
|
|
|
|
srcFSPath: path,
|
|
|
|
srcVol: "success-vol",
|
|
|
|
srcPath: "path",
|
|
|
|
expectedErr: errFileNotFound,
|
|
|
|
},
|
|
|
|
// Test case - 6.
|
|
|
|
// Test case with src path segment > 255.
|
|
|
|
{
|
|
|
|
srcFSPath: path,
|
|
|
|
srcVol: "success-vol",
|
|
|
|
srcPath: "my-obj-del-0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
|
|
|
|
expectedErr: errFileNameTooLong,
|
|
|
|
},
|
|
|
|
// Test case - 7.
|
|
|
|
// Test case validate only srcVol exists.
|
|
|
|
{
|
|
|
|
srcFSPath: path,
|
|
|
|
srcVol: "success-vol",
|
|
|
|
expectedErr: nil,
|
|
|
|
},
|
|
|
|
// Test case - 8.
|
|
|
|
// Test case validate only srcVol doesn't exist.
|
|
|
|
{
|
|
|
|
srcFSPath: path,
|
|
|
|
srcVol: "success-vol-non-existent",
|
|
|
|
expectedErr: errVolumeNotFound,
|
|
|
|
},
|
|
|
|
// Test case - 9.
|
|
|
|
// Test case validate invalid argument.
|
|
|
|
{
|
|
|
|
expectedErr: errInvalidArgument,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for i, testCase := range testCases {
|
|
|
|
if testCase.srcPath != "" {
|
|
|
|
if _, err := fsStatFile(GlobalContext, pathJoin(testCase.srcFSPath, testCase.srcVol,
|
|
|
|
testCase.srcPath)); err != testCase.expectedErr {
|
|
|
|
t.Fatalf("TestErasureStorage case %d: Expected: \"%s\", got: \"%s\"", i+1, testCase.expectedErr, err)
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if _, err := fsStatVolume(GlobalContext, pathJoin(testCase.srcFSPath, testCase.srcVol)); err != testCase.expectedErr {
|
|
|
|
t.Fatalf("TestFS case %d: Expected: \"%s\", got: \"%s\"", i+1, testCase.expectedErr, err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestFSCreateAndOpen(t *testing.T) {
|
|
|
|
// Setup test environment.
|
|
|
|
_, path, err := newXLStorageTestSetup()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("Unable to create xlStorage test setup, %s", err)
|
|
|
|
}
|
|
|
|
defer os.RemoveAll(path)
|
|
|
|
|
|
|
|
if err = fsMkdir(GlobalContext, pathJoin(path, "success-vol")); err != nil {
|
|
|
|
t.Fatalf("Unable to create directory, %s", err)
|
|
|
|
}
|
|
|
|
|
fix: use buffers only when necessary for io.Copy() (#11229)
Use separate sync.Pool for writes/reads
Avoid passing buffers for io.CopyBuffer()
if the writer or reader implement io.WriteTo or io.ReadFrom
respectively then its useless for sync.Pool to allocate
buffers on its own since that will be completely ignored
by the io.CopyBuffer Go implementation.
Improve this wherever we see this to be optimal.
This allows us to be more efficient on memory usage.
```
385 // copyBuffer is the actual implementation of Copy and CopyBuffer.
386 // if buf is nil, one is allocated.
387 func copyBuffer(dst Writer, src Reader, buf []byte) (written int64, err error) {
388 // If the reader has a WriteTo method, use it to do the copy.
389 // Avoids an allocation and a copy.
390 if wt, ok := src.(WriterTo); ok {
391 return wt.WriteTo(dst)
392 }
393 // Similarly, if the writer has a ReadFrom method, use it to do the copy.
394 if rt, ok := dst.(ReaderFrom); ok {
395 return rt.ReadFrom(src)
396 }
```
From readahead package
```
// WriteTo writes data to w until there's no more data to write or when an error occurs.
// The return value n is the number of bytes written.
// Any error encountered during the write is also returned.
func (a *reader) WriteTo(w io.Writer) (n int64, err error) {
if a.err != nil {
return 0, a.err
}
n = 0
for {
err = a.fill()
if err != nil {
return n, err
}
n2, err := w.Write(a.cur.buffer())
a.cur.inc(n2)
n += int64(n2)
if err != nil {
return n, err
}
```
4 years ago
|
|
|
if _, err = fsCreateFile(GlobalContext, "", nil, 0); err != errInvalidArgument {
|
|
|
|
t.Fatal("Unexpected error", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if _, _, err = fsOpenFile(GlobalContext, "", -1); err != errInvalidArgument {
|
|
|
|
t.Fatal("Unexpected error", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
var reader = bytes.NewReader([]byte("Hello, world"))
|
fix: use buffers only when necessary for io.Copy() (#11229)
Use separate sync.Pool for writes/reads
Avoid passing buffers for io.CopyBuffer()
if the writer or reader implement io.WriteTo or io.ReadFrom
respectively then its useless for sync.Pool to allocate
buffers on its own since that will be completely ignored
by the io.CopyBuffer Go implementation.
Improve this wherever we see this to be optimal.
This allows us to be more efficient on memory usage.
```
385 // copyBuffer is the actual implementation of Copy and CopyBuffer.
386 // if buf is nil, one is allocated.
387 func copyBuffer(dst Writer, src Reader, buf []byte) (written int64, err error) {
388 // If the reader has a WriteTo method, use it to do the copy.
389 // Avoids an allocation and a copy.
390 if wt, ok := src.(WriterTo); ok {
391 return wt.WriteTo(dst)
392 }
393 // Similarly, if the writer has a ReadFrom method, use it to do the copy.
394 if rt, ok := dst.(ReaderFrom); ok {
395 return rt.ReadFrom(src)
396 }
```
From readahead package
```
// WriteTo writes data to w until there's no more data to write or when an error occurs.
// The return value n is the number of bytes written.
// Any error encountered during the write is also returned.
func (a *reader) WriteTo(w io.Writer) (n int64, err error) {
if a.err != nil {
return 0, a.err
}
n = 0
for {
err = a.fill()
if err != nil {
return n, err
}
n2, err := w.Write(a.cur.buffer())
a.cur.inc(n2)
n += int64(n2)
if err != nil {
return n, err
}
```
4 years ago
|
|
|
if _, err = fsCreateFile(GlobalContext, pathJoin(path, "success-vol", "success-file"), reader, 0); err != nil {
|
|
|
|
t.Fatalf("Unable to create file, %s", err)
|
|
|
|
}
|
|
|
|
// Seek back.
|
|
|
|
reader.Seek(0, 0)
|
|
|
|
|
|
|
|
testCases := []struct {
|
|
|
|
srcVol string
|
|
|
|
srcPath string
|
|
|
|
expectedErr error
|
|
|
|
}{
|
|
|
|
// Test case - 1.
|
|
|
|
// Test case with segment of the volume name > 255.
|
|
|
|
{
|
|
|
|
srcVol: "my-obj-del-0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
|
|
|
|
srcPath: "success-file",
|
|
|
|
expectedErr: errFileNameTooLong,
|
|
|
|
},
|
|
|
|
// Test case - 2.
|
|
|
|
// Test case with src path segment > 255.
|
|
|
|
{
|
|
|
|
srcVol: "success-vol",
|
|
|
|
srcPath: "my-obj-del-0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
|
|
|
|
expectedErr: errFileNameTooLong,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for i, testCase := range testCases {
|
fix: use buffers only when necessary for io.Copy() (#11229)
Use separate sync.Pool for writes/reads
Avoid passing buffers for io.CopyBuffer()
if the writer or reader implement io.WriteTo or io.ReadFrom
respectively then its useless for sync.Pool to allocate
buffers on its own since that will be completely ignored
by the io.CopyBuffer Go implementation.
Improve this wherever we see this to be optimal.
This allows us to be more efficient on memory usage.
```
385 // copyBuffer is the actual implementation of Copy and CopyBuffer.
386 // if buf is nil, one is allocated.
387 func copyBuffer(dst Writer, src Reader, buf []byte) (written int64, err error) {
388 // If the reader has a WriteTo method, use it to do the copy.
389 // Avoids an allocation and a copy.
390 if wt, ok := src.(WriterTo); ok {
391 return wt.WriteTo(dst)
392 }
393 // Similarly, if the writer has a ReadFrom method, use it to do the copy.
394 if rt, ok := dst.(ReaderFrom); ok {
395 return rt.ReadFrom(src)
396 }
```
From readahead package
```
// WriteTo writes data to w until there's no more data to write or when an error occurs.
// The return value n is the number of bytes written.
// Any error encountered during the write is also returned.
func (a *reader) WriteTo(w io.Writer) (n int64, err error) {
if a.err != nil {
return 0, a.err
}
n = 0
for {
err = a.fill()
if err != nil {
return n, err
}
n2, err := w.Write(a.cur.buffer())
a.cur.inc(n2)
n += int64(n2)
if err != nil {
return n, err
}
```
4 years ago
|
|
|
_, err = fsCreateFile(GlobalContext, pathJoin(path, testCase.srcVol, testCase.srcPath), reader, 0)
|
|
|
|
if err != testCase.expectedErr {
|
|
|
|
t.Errorf("Test case %d: Expected: \"%s\", got: \"%s\"", i+1, testCase.expectedErr, err)
|
|
|
|
}
|
|
|
|
_, _, err = fsOpenFile(GlobalContext, pathJoin(path, testCase.srcVol, testCase.srcPath), 0)
|
|
|
|
if err != testCase.expectedErr {
|
|
|
|
t.Errorf("Test case %d: Expected: \"%s\", got: \"%s\"", i+1, testCase.expectedErr, err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Attempt to open a directory.
|
|
|
|
if _, _, err = fsOpenFile(GlobalContext, pathJoin(path), 0); err != errIsNotRegular {
|
|
|
|
t.Fatal("Unexpected error", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestFSDeletes(t *testing.T) {
|
|
|
|
// create xlStorage test setup
|
|
|
|
_, path, err := newXLStorageTestSetup()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("Unable to create xlStorage test setup, %s", err)
|
|
|
|
}
|
|
|
|
defer os.RemoveAll(path)
|
|
|
|
|
|
|
|
// Setup test environment.
|
|
|
|
if err = fsMkdir(GlobalContext, pathJoin(path, "success-vol")); err != nil {
|
|
|
|
t.Fatalf("Unable to create directory, %s", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
var reader = bytes.NewReader([]byte("Hello, world"))
|
fix: use buffers only when necessary for io.Copy() (#11229)
Use separate sync.Pool for writes/reads
Avoid passing buffers for io.CopyBuffer()
if the writer or reader implement io.WriteTo or io.ReadFrom
respectively then its useless for sync.Pool to allocate
buffers on its own since that will be completely ignored
by the io.CopyBuffer Go implementation.
Improve this wherever we see this to be optimal.
This allows us to be more efficient on memory usage.
```
385 // copyBuffer is the actual implementation of Copy and CopyBuffer.
386 // if buf is nil, one is allocated.
387 func copyBuffer(dst Writer, src Reader, buf []byte) (written int64, err error) {
388 // If the reader has a WriteTo method, use it to do the copy.
389 // Avoids an allocation and a copy.
390 if wt, ok := src.(WriterTo); ok {
391 return wt.WriteTo(dst)
392 }
393 // Similarly, if the writer has a ReadFrom method, use it to do the copy.
394 if rt, ok := dst.(ReaderFrom); ok {
395 return rt.ReadFrom(src)
396 }
```
From readahead package
```
// WriteTo writes data to w until there's no more data to write or when an error occurs.
// The return value n is the number of bytes written.
// Any error encountered during the write is also returned.
func (a *reader) WriteTo(w io.Writer) (n int64, err error) {
if a.err != nil {
return 0, a.err
}
n = 0
for {
err = a.fill()
if err != nil {
return n, err
}
n2, err := w.Write(a.cur.buffer())
a.cur.inc(n2)
n += int64(n2)
if err != nil {
return n, err
}
```
4 years ago
|
|
|
if _, err = fsCreateFile(GlobalContext, pathJoin(path, "success-vol", "success-file"), reader, reader.Size()); err != nil {
|
|
|
|
t.Fatalf("Unable to create file, %s", err)
|
|
|
|
}
|
|
|
|
// Seek back.
|
|
|
|
reader.Seek(0, io.SeekStart)
|
|
|
|
|
|
|
|
// folder is not empty
|
|
|
|
err = fsMkdir(GlobalContext, pathJoin(path, "success-vol", "not-empty"))
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
err = ioutil.WriteFile(pathJoin(path, "success-vol", "not-empty", "file"), []byte("data"), 0777)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// recursive
|
|
|
|
if err = fsMkdir(GlobalContext, pathJoin(path, "success-vol", "parent")); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if err = fsMkdir(GlobalContext, pathJoin(path, "success-vol", "parent", "dir")); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
testCases := []struct {
|
|
|
|
basePath string
|
|
|
|
srcVol string
|
|
|
|
srcPath string
|
|
|
|
expectedErr error
|
|
|
|
}{
|
|
|
|
// valid case with existing volume and file to delete.
|
|
|
|
{
|
|
|
|
basePath: path,
|
|
|
|
srcVol: "success-vol",
|
|
|
|
srcPath: "success-file",
|
|
|
|
expectedErr: nil,
|
|
|
|
},
|
|
|
|
// The file was deleted in the last case, so Delete should fail.
|
|
|
|
{
|
|
|
|
basePath: path,
|
|
|
|
srcVol: "success-vol",
|
|
|
|
srcPath: "success-file",
|
|
|
|
expectedErr: errFileNotFound,
|
|
|
|
},
|
|
|
|
// Test case with segment of the volume name > 255.
|
|
|
|
{
|
|
|
|
basePath: path,
|
|
|
|
srcVol: "my-obj-del-0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
|
|
|
|
srcPath: "success-file",
|
|
|
|
expectedErr: errFileNameTooLong,
|
|
|
|
},
|
|
|
|
// Test case with src path segment > 255.
|
|
|
|
{
|
|
|
|
basePath: path,
|
|
|
|
srcVol: "success-vol",
|
|
|
|
srcPath: "my-obj-del-0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
|
|
|
|
expectedErr: errFileNameTooLong,
|
|
|
|
},
|
|
|
|
// Base path is way too long.
|
|
|
|
{
|
|
|
|
basePath: "path03333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333",
|
|
|
|
srcVol: "success-vol",
|
|
|
|
srcPath: "object",
|
|
|
|
expectedErr: errFileNameTooLong,
|
|
|
|
},
|
|
|
|
// Directory is not empty. Should give nil, but won't delete.
|
|
|
|
{
|
|
|
|
basePath: path,
|
|
|
|
srcVol: "success-vol",
|
|
|
|
srcPath: "not-empty",
|
|
|
|
expectedErr: nil,
|
|
|
|
},
|
|
|
|
// Should delete recursively.
|
|
|
|
{
|
|
|
|
basePath: path,
|
|
|
|
srcVol: "success-vol",
|
|
|
|
srcPath: pathJoin("parent", "dir"),
|
|
|
|
expectedErr: nil,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for i, testCase := range testCases {
|
|
|
|
if err = fsDeleteFile(GlobalContext, testCase.basePath, pathJoin(testCase.basePath, testCase.srcVol, testCase.srcPath)); err != testCase.expectedErr {
|
|
|
|
t.Errorf("Test case %d: Expected: \"%s\", got: \"%s\"", i+1, testCase.expectedErr, err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func BenchmarkFSDeleteFile(b *testing.B) {
|
|
|
|
// create xlStorage test setup
|
|
|
|
_, path, err := newXLStorageTestSetup()
|
|
|
|
if err != nil {
|
|
|
|
b.Fatalf("Unable to create xlStorage test setup, %s", err)
|
|
|
|
}
|
|
|
|
defer os.RemoveAll(path)
|
|
|
|
|
|
|
|
// Setup test environment.
|
|
|
|
if err = fsMkdir(GlobalContext, pathJoin(path, "benchmark")); err != nil {
|
|
|
|
b.Fatalf("Unable to create directory, %s", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
benchDir := pathJoin(path, "benchmark")
|
|
|
|
filename := pathJoin(benchDir, "file.txt")
|
|
|
|
|
|
|
|
b.ResetTimer()
|
|
|
|
// We need to create and delete the file sequentially inside the benchmark.
|
|
|
|
for i := 0; i < b.N; i++ {
|
|
|
|
b.StopTimer()
|
|
|
|
err = ioutil.WriteFile(filename, []byte("data"), 0777)
|
|
|
|
if err != nil {
|
|
|
|
b.Fatal(err)
|
|
|
|
}
|
|
|
|
b.StartTimer()
|
|
|
|
|
|
|
|
err = fsDeleteFile(GlobalContext, benchDir, filename)
|
|
|
|
if err != nil {
|
|
|
|
b.Fatal(err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Tests fs removes.
|
|
|
|
func TestFSRemoves(t *testing.T) {
|
|
|
|
// create xlStorage test setup
|
|
|
|
_, path, err := newXLStorageTestSetup()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("Unable to create xlStorage test setup, %s", err)
|
|
|
|
}
|
|
|
|
defer os.RemoveAll(path)
|
|
|
|
|
|
|
|
// Setup test environment.
|
|
|
|
if err = fsMkdir(GlobalContext, pathJoin(path, "success-vol")); err != nil {
|
|
|
|
t.Fatalf("Unable to create directory, %s", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
var reader = bytes.NewReader([]byte("Hello, world"))
|
fix: use buffers only when necessary for io.Copy() (#11229)
Use separate sync.Pool for writes/reads
Avoid passing buffers for io.CopyBuffer()
if the writer or reader implement io.WriteTo or io.ReadFrom
respectively then its useless for sync.Pool to allocate
buffers on its own since that will be completely ignored
by the io.CopyBuffer Go implementation.
Improve this wherever we see this to be optimal.
This allows us to be more efficient on memory usage.
```
385 // copyBuffer is the actual implementation of Copy and CopyBuffer.
386 // if buf is nil, one is allocated.
387 func copyBuffer(dst Writer, src Reader, buf []byte) (written int64, err error) {
388 // If the reader has a WriteTo method, use it to do the copy.
389 // Avoids an allocation and a copy.
390 if wt, ok := src.(WriterTo); ok {
391 return wt.WriteTo(dst)
392 }
393 // Similarly, if the writer has a ReadFrom method, use it to do the copy.
394 if rt, ok := dst.(ReaderFrom); ok {
395 return rt.ReadFrom(src)
396 }
```
From readahead package
```
// WriteTo writes data to w until there's no more data to write or when an error occurs.
// The return value n is the number of bytes written.
// Any error encountered during the write is also returned.
func (a *reader) WriteTo(w io.Writer) (n int64, err error) {
if a.err != nil {
return 0, a.err
}
n = 0
for {
err = a.fill()
if err != nil {
return n, err
}
n2, err := w.Write(a.cur.buffer())
a.cur.inc(n2)
n += int64(n2)
if err != nil {
return n, err
}
```
4 years ago
|
|
|
if _, err = fsCreateFile(GlobalContext, pathJoin(path, "success-vol", "success-file"), reader, 0); err != nil {
|
|
|
|
t.Fatalf("Unable to create file, %s", err)
|
|
|
|
}
|
|
|
|
// Seek back.
|
|
|
|
reader.Seek(0, 0)
|
|
|
|
|
fix: use buffers only when necessary for io.Copy() (#11229)
Use separate sync.Pool for writes/reads
Avoid passing buffers for io.CopyBuffer()
if the writer or reader implement io.WriteTo or io.ReadFrom
respectively then its useless for sync.Pool to allocate
buffers on its own since that will be completely ignored
by the io.CopyBuffer Go implementation.
Improve this wherever we see this to be optimal.
This allows us to be more efficient on memory usage.
```
385 // copyBuffer is the actual implementation of Copy and CopyBuffer.
386 // if buf is nil, one is allocated.
387 func copyBuffer(dst Writer, src Reader, buf []byte) (written int64, err error) {
388 // If the reader has a WriteTo method, use it to do the copy.
389 // Avoids an allocation and a copy.
390 if wt, ok := src.(WriterTo); ok {
391 return wt.WriteTo(dst)
392 }
393 // Similarly, if the writer has a ReadFrom method, use it to do the copy.
394 if rt, ok := dst.(ReaderFrom); ok {
395 return rt.ReadFrom(src)
396 }
```
From readahead package
```
// WriteTo writes data to w until there's no more data to write or when an error occurs.
// The return value n is the number of bytes written.
// Any error encountered during the write is also returned.
func (a *reader) WriteTo(w io.Writer) (n int64, err error) {
if a.err != nil {
return 0, a.err
}
n = 0
for {
err = a.fill()
if err != nil {
return n, err
}
n2, err := w.Write(a.cur.buffer())
a.cur.inc(n2)
n += int64(n2)
if err != nil {
return n, err
}
```
4 years ago
|
|
|
if _, err = fsCreateFile(GlobalContext, pathJoin(path, "success-vol", "success-file-new"), reader, 0); err != nil {
|
|
|
|
t.Fatalf("Unable to create file, %s", err)
|
|
|
|
}
|
|
|
|
// Seek back.
|
|
|
|
reader.Seek(0, 0)
|
|
|
|
|
|
|
|
testCases := []struct {
|
|
|
|
srcFSPath string
|
|
|
|
srcVol string
|
|
|
|
srcPath string
|
|
|
|
expectedErr error
|
|
|
|
}{
|
|
|
|
// Test case - 1.
|
|
|
|
// valid case with existing volume and file to delete.
|
|
|
|
{
|
|
|
|
srcFSPath: path,
|
|
|
|
srcVol: "success-vol",
|
|
|
|
srcPath: "success-file",
|
|
|
|
expectedErr: nil,
|
|
|
|
},
|
|
|
|
// Test case - 2.
|
|
|
|
// The file was deleted in the last case, so Delete should fail.
|
|
|
|
{
|
|
|
|
srcFSPath: path,
|
|
|
|
srcVol: "success-vol",
|
|
|
|
srcPath: "success-file",
|
|
|
|
expectedErr: errFileNotFound,
|
|
|
|
},
|
|
|
|
// Test case - 3.
|
|
|
|
// Test case with segment of the volume name > 255.
|
|
|
|
{
|
|
|
|
srcFSPath: path,
|
|
|
|
srcVol: "my-obj-del-0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
|
|
|
|
srcPath: "success-file",
|
|
|
|
expectedErr: errFileNameTooLong,
|
|
|
|
},
|
|
|
|
// Test case - 4.
|
|
|
|
// Test case with src path segment > 255.
|
|
|
|
{
|
|
|
|
srcFSPath: path,
|
|
|
|
srcVol: "success-vol",
|
|
|
|
srcPath: "my-obj-del-0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
|
|
|
|
expectedErr: errFileNameTooLong,
|
|
|
|
},
|
|
|
|
// Test case - 5.
|
|
|
|
// Test case with src path empty.
|
|
|
|
{
|
|
|
|
srcFSPath: path,
|
|
|
|
srcVol: "success-vol",
|
|
|
|
expectedErr: errVolumeNotEmpty,
|
|
|
|
},
|
|
|
|
// Test case - 6.
|
|
|
|
// Test case with src path empty.
|
|
|
|
{
|
|
|
|
srcFSPath: path,
|
|
|
|
srcVol: "my-obj-del-0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
|
|
|
|
expectedErr: errFileNameTooLong,
|
|
|
|
},
|
|
|
|
// Test case - 7.
|
|
|
|
// Test case with src path empty.
|
|
|
|
{
|
|
|
|
srcFSPath: path,
|
|
|
|
srcVol: "non-existent",
|
|
|
|
expectedErr: errVolumeNotFound,
|
|
|
|
},
|
|
|
|
// Test case - 8.
|
|
|
|
// Test case with src and volume path empty.
|
|
|
|
{
|
|
|
|
expectedErr: errInvalidArgument,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for i, testCase := range testCases {
|
|
|
|
if testCase.srcPath != "" {
|
|
|
|
if err = fsRemoveFile(GlobalContext, pathJoin(testCase.srcFSPath, testCase.srcVol, testCase.srcPath)); err != testCase.expectedErr {
|
|
|
|
t.Errorf("Test case %d: Expected: \"%s\", got: \"%s\"", i+1, testCase.expectedErr, err)
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if err = fsRemoveDir(GlobalContext, pathJoin(testCase.srcFSPath, testCase.srcVol, testCase.srcPath)); err != testCase.expectedErr {
|
|
|
|
t.Error(err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if err = fsRemoveAll(GlobalContext, pathJoin(path, "success-vol")); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if err = fsRemoveAll(GlobalContext, ""); err != errInvalidArgument {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if err = fsRemoveAll(GlobalContext, "my-obj-del-0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001"); err != errFileNameTooLong {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestFSRemoveMeta(t *testing.T) {
|
|
|
|
// create xlStorage test setup
|
|
|
|
_, fsPath, err := newXLStorageTestSetup()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("Unable to create xlStorage test setup, %s", err)
|
|
|
|
}
|
|
|
|
defer os.RemoveAll(fsPath)
|
|
|
|
|
|
|
|
// Setup test environment.
|
|
|
|
if err = fsMkdir(GlobalContext, pathJoin(fsPath, "success-vol")); err != nil {
|
|
|
|
t.Fatalf("Unable to create directory, %s", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
filePath := pathJoin(fsPath, "success-vol", "success-file")
|
|
|
|
|
|
|
|
var reader = bytes.NewReader([]byte("Hello, world"))
|
fix: use buffers only when necessary for io.Copy() (#11229)
Use separate sync.Pool for writes/reads
Avoid passing buffers for io.CopyBuffer()
if the writer or reader implement io.WriteTo or io.ReadFrom
respectively then its useless for sync.Pool to allocate
buffers on its own since that will be completely ignored
by the io.CopyBuffer Go implementation.
Improve this wherever we see this to be optimal.
This allows us to be more efficient on memory usage.
```
385 // copyBuffer is the actual implementation of Copy and CopyBuffer.
386 // if buf is nil, one is allocated.
387 func copyBuffer(dst Writer, src Reader, buf []byte) (written int64, err error) {
388 // If the reader has a WriteTo method, use it to do the copy.
389 // Avoids an allocation and a copy.
390 if wt, ok := src.(WriterTo); ok {
391 return wt.WriteTo(dst)
392 }
393 // Similarly, if the writer has a ReadFrom method, use it to do the copy.
394 if rt, ok := dst.(ReaderFrom); ok {
395 return rt.ReadFrom(src)
396 }
```
From readahead package
```
// WriteTo writes data to w until there's no more data to write or when an error occurs.
// The return value n is the number of bytes written.
// Any error encountered during the write is also returned.
func (a *reader) WriteTo(w io.Writer) (n int64, err error) {
if a.err != nil {
return 0, a.err
}
n = 0
for {
err = a.fill()
if err != nil {
return n, err
}
n2, err := w.Write(a.cur.buffer())
a.cur.inc(n2)
n += int64(n2)
if err != nil {
return n, err
}
```
4 years ago
|
|
|
if _, err = fsCreateFile(GlobalContext, filePath, reader, 0); err != nil {
|
|
|
|
t.Fatalf("Unable to create file, %s", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
rwPool := &fsIOPool{
|
|
|
|
readersMap: make(map[string]*lock.RLockedFile),
|
|
|
|
}
|
|
|
|
|
|
|
|
if _, err := rwPool.Open(filePath); err != nil {
|
|
|
|
t.Fatalf("Unable to lock file %s", filePath)
|
|
|
|
}
|
|
|
|
|
|
|
|
defer rwPool.Close(filePath)
|
|
|
|
|
|
|
|
tmpDir, tmpErr := ioutil.TempDir(globalTestTmpDir, "minio-")
|
|
|
|
if tmpErr != nil {
|
|
|
|
t.Fatal(tmpErr)
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := fsRemoveMeta(GlobalContext, fsPath, filePath, tmpDir); err != nil {
|
|
|
|
t.Fatalf("Unable to remove file, %s", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if _, err := os.Stat((filePath)); !osIsNotExist(err) {
|
|
|
|
t.Fatalf("`%s` file found though it should have been deleted.", filePath)
|
|
|
|
}
|
|
|
|
|
|
|
|
if _, err := os.Stat((path.Dir(filePath))); !osIsNotExist(err) {
|
|
|
|
t.Fatalf("`%s` parent directory found though it should have been deleted.", filePath)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestFSIsFile(t *testing.T) {
|
|
|
|
dirPath, err := ioutil.TempDir(globalTestTmpDir, "minio-")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("Unable to create tmp directory %s", err)
|
|
|
|
}
|
|
|
|
defer os.RemoveAll(dirPath)
|
|
|
|
|
|
|
|
filePath := pathJoin(dirPath, "tmpfile")
|
|
|
|
|
|
|
|
if err = ioutil.WriteFile(filePath, nil, 0777); err != nil {
|
|
|
|
t.Fatalf("Unable to create file %s", filePath)
|
|
|
|
}
|
|
|
|
|
|
|
|
if !fsIsFile(GlobalContext, filePath) {
|
|
|
|
t.Fatalf("Expected %s to be a file", filePath)
|
|
|
|
}
|
|
|
|
}
|