aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchrislusf <chris.lu@gmail.com>2015-01-13 08:25:22 -0800
committerchrislusf <chris.lu@gmail.com>2015-01-13 08:25:22 -0800
commit996a1789e8ecb0254e87f8da7066813fdbf1df30 (patch)
tree95c8e70116dd18b673292c9e52ae2a00d7011f29
parent5afdc469a3d96c168e250af1c16a5c4419accedc (diff)
parent029e3a38227c6bf9718d9771b7816b0b9efaeb97 (diff)
downloadseaweedfs-996a1789e8ecb0254e87f8da7066813fdbf1df30.tar.xz
seaweedfs-996a1789e8ecb0254e87f8da7066813fdbf1df30.zip
Merge pull request #58 from carmark/master
fix some typos
-rw-r--r--go/storage/needle_read_write.go2
-rw-r--r--go/storage/store.go2
-rw-r--r--go/storage/volume.go2
-rw-r--r--go/topology/topology.go2
-rw-r--r--go/weed/weed_server/volume_server_handlers_helper.go2
5 files changed, 5 insertions, 5 deletions
diff --git a/go/storage/needle_read_write.go b/go/storage/needle_read_write.go
index 663b5abbd..6af8a660e 100644
--- a/go/storage/needle_read_write.go
+++ b/go/storage/needle_read_write.go
@@ -35,7 +35,7 @@ func (n *Needle) Append(w io.Writer, version Version) (size uint32, err error) {
}
}(s, end)
} else {
- err = fmt.Errorf("Cnnot Read Current Volume Position: %s", e.Error())
+ err = fmt.Errorf("Cannot Read Current Volume Position: %s", e.Error())
return
}
}
diff --git a/go/storage/store.go b/go/storage/store.go
index 65eed1d0e..7e2b23058 100644
--- a/go/storage/store.go
+++ b/go/storage/store.go
@@ -64,7 +64,7 @@ func (mn *MasterNodes) findMaster() (string, error) {
}
}
if mn.lastNode < 0 {
- return "", errors.New("No master node avalable!")
+ return "", errors.New("No master node available!")
}
return mn.nodes[mn.lastNode], nil
}
diff --git a/go/storage/volume.go b/go/storage/volume.go
index a1eccd62c..221b8d2c3 100644
--- a/go/storage/volume.go
+++ b/go/storage/volume.go
@@ -175,7 +175,7 @@ func (v *Volume) write(n *Needle) (size uint32, err error) {
}
var offset int64
if offset, err = v.dataFile.Seek(0, 2); err != nil {
- glog.V(0).Infof("faile to seek the end of file: %v", err)
+ glog.V(0).Infof("failed to seek the end of file: %v", err)
return
}
diff --git a/go/topology/topology.go b/go/topology/topology.go
index c2073ed2f..4cfd070db 100644
--- a/go/topology/topology.go
+++ b/go/topology/topology.go
@@ -119,7 +119,7 @@ func (t *Topology) HasWritableVolume(option *VolumeGrowOption) bool {
func (t *Topology) PickForWrite(count int, option *VolumeGrowOption) (string, int, *DataNode, error) {
vid, count, datanodes, err := t.GetVolumeLayout(option.Collection, option.ReplicaPlacement, option.Ttl).PickForWrite(count, option)
if err != nil || datanodes.Length() == 0 {
- return "", 0, nil, errors.New("No writable volumes avalable!")
+ return "", 0, nil, errors.New("No writable volumes available!")
}
fileId, count := t.Sequence.NextFileId(count)
return storage.NewFileId(*vid, fileId, rand.Uint32()).String(), count, datanodes.Head(), nil
diff --git a/go/weed/weed_server/volume_server_handlers_helper.go b/go/weed/weed_server/volume_server_handlers_helper.go
index 6d21ffb62..2bab35e45 100644
--- a/go/weed/weed_server/volume_server_handlers_helper.go
+++ b/go/weed/weed_server/volume_server_handlers_helper.go
@@ -93,7 +93,7 @@ func (w *countingWriter) Write(p []byte) (n int, err error) {
return len(p), nil
}
-// rangesMIMESize returns the nunber of bytes it takes to encode the
+// rangesMIMESize returns the number of bytes it takes to encode the
// provided ranges as a multipart response.
func rangesMIMESize(ranges []httpRange, contentType string, contentSize int64) (encSize int64) {
var w countingWriter