diff options
Diffstat (limited to 'go')
| -rw-r--r-- | go/operation/lookup_volume_id.go | 8 | ||||
| -rw-r--r-- | go/storage/compact_map.go | 4 | ||||
| -rw-r--r-- | go/storage/needle.go | 20 | ||||
| -rw-r--r-- | go/storage/needle_read_write.go | 2 | ||||
| -rw-r--r-- | go/topology/node_list_test.go | 8 | ||||
| -rw-r--r-- | go/topology/topology_compact.go | 2 | ||||
| -rw-r--r-- | go/weed/upload.go | 14 | ||||
| -rw-r--r-- | go/weed/volume.go | 2 |
8 files changed, 30 insertions, 30 deletions
diff --git a/go/operation/lookup_volume_id.go b/go/operation/lookup_volume_id.go index 516ba9129..8512ac918 100644 --- a/go/operation/lookup_volume_id.go +++ b/go/operation/lookup_volume_id.go @@ -10,12 +10,12 @@ import ( ) type Location struct { - Url string "url" - PublicUrl string "publicUrl" + Url string `json:"url"` + PublicUrl string `json:"publicUrl"` } type LookupResult struct { - Locations []Location "locations" - Error string "error" + Locations []Location `json:"locations"` + Error string `json:"error"` } //TODO: Add a caching for vid here diff --git a/go/storage/compact_map.go b/go/storage/compact_map.go index 0b33961c4..65fdf0e95 100644 --- a/go/storage/compact_map.go +++ b/go/storage/compact_map.go @@ -4,8 +4,8 @@ import () type NeedleValue struct { Key Key - Offset uint32 "Volume offset" //since aligned to 8 bytes, range is 4G*8=32G - Size uint32 "Size of the data portion" + Offset uint32 `comment:"Volume offset"` //since aligned to 8 bytes, range is 4G*8=32G + Size uint32 `comment:"Size of the data portion"` } const ( diff --git a/go/storage/needle.go b/go/storage/needle.go index 2b66f5d69..12d46edff 100644 --- a/go/storage/needle.go +++ b/go/storage/needle.go @@ -19,20 +19,20 @@ const ( ) type Needle struct { - Cookie uint32 "random number to mitigate brute force lookups" - Id uint64 "needle id" - Size uint32 "sum of DataSize,Data,NameSize,Name,MimeSize,Mime" + Cookie uint32 `comment:"random number to mitigate brute force lookups"` + Id uint64 `comment:"needle id"` + Size uint32 `comment:"sum of DataSize,Data,NameSize,Name,MimeSize,Mime"` - DataSize uint32 "Data size" //version2 - Data []byte "The actual file data" - Flags byte "boolean flags" //version2 + DataSize uint32 `comment:"Data size"` //version2 + Data []byte `comment:"The actual file data"` + Flags byte `comment:"boolean flags"` //version2 NameSize uint8 //version2 - Name []byte "maximum 256 characters" //version2 + Name []byte `comment:"maximum 256 characters"` //version2 MimeSize uint8 //version2 - Mime []byte "maximum 256 characters" //version2 + Mime []byte `comment:"maximum 256 characters"` //version2 - Checksum CRC "CRC32 to check integrity" - Padding []byte "Aligned to 8 bytes" + Checksum CRC `comment:"CRC32 to check integrity"` + Padding []byte `comment:"Aligned to 8 bytes"` } func NewNeedle(r *http.Request) (n *Needle, fname string, e error) { diff --git a/go/storage/needle_read_write.go b/go/storage/needle_read_write.go index 0777fd106..881db50a6 100644 --- a/go/storage/needle_read_write.go +++ b/go/storage/needle_read_write.go @@ -24,7 +24,7 @@ func (n *Needle) Append(w io.Writer, version Version) (size uint32, err error) { defer func(s io.Seeker, off int64) { if err != nil { if _, e = s.Seek(off, 0); e != nil { - fmt.Printf("Failed to seek back to %d with error: %s\n", w, off, e) + fmt.Printf("Failed to seek %s back to %d with error: %s\n", w, off, e) } } }(s, end) diff --git a/go/topology/node_list_test.go b/go/topology/node_list_test.go index 2fb4fa970..4cd2ebaa1 100644 --- a/go/topology/node_list_test.go +++ b/go/topology/node_list_test.go @@ -18,22 +18,22 @@ func TestXYZ(t *testing.T) { picked, ret := nl.RandomlyPickN(1) if !ret || len(picked) != 1 { - t.Errorf("need to randomly pick 1 node") + t.Error("need to randomly pick 1 node") } picked, ret = nl.RandomlyPickN(4) if !ret || len(picked) != 4 { - t.Errorf("need to randomly pick 4 nodes") + t.Error("need to randomly pick 4 nodes") } picked, ret = nl.RandomlyPickN(5) if !ret || len(picked) != 5 { - t.Errorf("need to randomly pick 5 nodes") + t.Error("need to randomly pick 5 nodes") } picked, ret = nl.RandomlyPickN(6) if ret || len(picked) != 0 { - t.Errorf("can not randomly pick 6 nodes:", ret, picked) + t.Error("can not randomly pick 6 nodes:", ret, picked) } } diff --git a/go/topology/topology_compact.go b/go/topology/topology_compact.go index e25e394d4..9c9abde4f 100644 --- a/go/topology/topology_compact.go +++ b/go/topology/topology_compact.go @@ -41,7 +41,7 @@ func batchVacuumVolumeCompact(vl *VolumeLayout, vid storage.VolumeId, locationli ch := make(chan bool, locationlist.Length()) for index, dn := range locationlist.list { go func(index int, url string, vid storage.VolumeId) { - fmt.Println(index, "Start vacuuming", vid, "on", dn.Url()) + fmt.Println(index, "Start vacuuming", vid, "on", url) if e := vacuumVolume_Compact(url, vid); e != nil { fmt.Println(index, "Error when vacuuming", vid, "on", url, e) ch <- false diff --git a/go/weed/upload.go b/go/weed/upload.go index 0260c9c87..92478b7b6 100644 --- a/go/weed/upload.go +++ b/go/weed/upload.go @@ -32,11 +32,11 @@ var cmdUpload = &Command{ } type AssignResult struct { - Fid string "fid" - Url string "url" - PublicUrl string "publicUrl" + Fid string `json:"fid"` + Url string `json:"url"` + PublicUrl string `json:"publicUrl"` Count int - Error string "error" + Error string `json:"error"` } func assign(count int) (*AssignResult, error) { @@ -74,9 +74,9 @@ func upload(filename string, server string, fid string) (int, error) { } type SubmitResult struct { - Fid string "fid" - Size int "size" - Error string "error" + Fid string `json:"fid"` + Size int `json:"size"` + Error string `json:"error"` } func submit(files []string) []SubmitResult { diff --git a/go/weed/volume.go b/go/weed/volume.go index bf906681e..edf2ad821 100644 --- a/go/weed/volume.go +++ b/go/weed/volume.go @@ -242,7 +242,7 @@ func DeleteHandler(w http.ResponseWriter, r *http.Request) { n.Size = 0 ret, err := store.Delete(volumeId, n) if err != nil { - log.Printf("delete error: %s\n", err) + log.Println("delete error:", err) return } |