gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix nil raft server caused crash

Browse Source 
fix https://github.com/chrislusf/seaweedfs/issues/524
This commit is contained in:
Chris Lu
2017-07-03 22:35:28 -07:00
parent 1fbb8723dc
commit f9a1769df1
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
weed/server/master_server_handlers_ui.go
View File

@@ -3,9 +3,10 @@ package weed_server
import ( import (
"net/http" "net/http"
"github.com/chrislusf/raft"
ui "github.com/chrislusf/seaweedfs/weed/server/master_ui"
"github.com/chrislusf/seaweedfs/weed/stats" "github.com/chrislusf/seaweedfs/weed/stats"
"github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/util"
ui "github.com/chrislusf/seaweedfs/weed/server/master_ui"
) )
func (ms *MasterServer) uiStatusHandler(w http.ResponseWriter, r *http.Request) { func (ms *MasterServer) uiStatusHandler(w http.ResponseWriter, r *http.Request) {
@@ -14,15 +15,13 @@ func (ms *MasterServer) uiStatusHandler(w http.ResponseWriter, r *http.Request)
args := struct { args := struct {
Version string Version string
Topology interface{} Topology interface{}
Leader string RaftServer raft.Server
Peers interface{}
Stats map[string]interface{} Stats map[string]interface{}
Counters *stats.ServerStats Counters *stats.ServerStats
}{ }{
util.VERSION, util.VERSION,
ms.Topo.ToMap(), ms.Topo.ToMap(),
ms.Topo.RaftServer.Leader(), ms.Topo.RaftServer,
ms.Topo.RaftServer.Peers(),
infos, infos,
serverStats, serverStats,
} }

2
weed/server/master_ui/templates.go
View File

@@ -33,6 +33,7 @@ var StatusTpl = template.Must(template.New("status").Parse(`<!DOCTYPE html>
<th>Max</th> <th>Max</th>
<td>{{ .Topology.Max }}</td> <td>{{ .Topology.Max }}</td>
</tr> </tr>
{{ with .RaftServer }}
<tr> <tr>
<th>Leader</th> <th>Leader</th>
<td><a href="http://{{ .Leader }}">{{ .Leader }}</a></td> <td><a href="http://{{ .Leader }}">{{ .Leader }}</a></td>
@@ -45,6 +46,7 @@ var StatusTpl = template.Must(template.New("status").Parse(`<!DOCTYPE html>
{{ end }} {{ end }}
</ul></td> </ul></td>
</tr> </tr>
{{ end }}
</tbody> </tbody>
</table> </table>
</div> </div>