configurable read timeout

weed-fs/src/cmd/weed/master.go

@@ -34,6 +34,7 @@ var (
 	mpulse            = cmdMaster.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats")
 	confFile          = cmdMaster.Flag.String("conf", "/etc/weedfs/weedfs.conf", "xml configuration file")
 	defaultRepType    = cmdMaster.Flag.String("defaultReplicationType", "00", "Default replication type if not specified.")
+	mReadTimeout      = cmdMaster.Flag.Int("readTimeout", 5, "connection read timeout in seconds")
 )
 
 var topo *topology.Topology
@@ -144,7 +145,7 @@ func runMaster(cmd *Command, args []string) bool {
 	srv := &http.Server{
 		Addr:        ":" + strconv.Itoa(*mport),
 		Handler:     http.DefaultServeMux,
-    ReadTimeout: 5*time.Second,
+		ReadTimeout: time.Duration(*mReadTimeout) * time.Second,
 	}
 	e := srv.ListenAndServe()
 	if e != nil {

weed-fs/src/cmd/weed/volume.go

@@ -33,8 +33,9 @@ var (
 	ip             = cmdVolume.Flag.String("ip", "localhost", "ip or server name")
 	publicUrl      = cmdVolume.Flag.String("publicUrl", "", "Publicly accessible <ip|server_name>:<port>")
 	masterNode     = cmdVolume.Flag.String("mserver", "localhost:9333", "master server location")
-	vpulse         = cmdVolume.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats")
+	vpulse         = cmdVolume.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats, must be smaller than the master's setting")
 	maxVolumeCount = cmdVolume.Flag.Int("max", 5, "maximum number of volumes")
+	vReadTimeout   = cmdVolume.Flag.Int("readTimeout", 5, "connection read timeout in seconds")
 
 	store *storage.Store
 )
@@ -276,7 +277,7 @@ func runVolume(cmd *Command, args []string) bool {
 	srv := &http.Server{
 		Addr:        ":" + strconv.Itoa(*vport),
 		Handler:     http.DefaultServeMux,
-    ReadTimeout: 5*time.Second,
+		ReadTimeout: (time.Duration(*vReadTimeout) * time.Second),
 	}
 	e := srv.ListenAndServe()
 	if e != nil {