Add disk detection for Linux, add new RPC service GetDiskInfoService(), remove dummy HelloService()

pkg/server/router.go

@@ -117,9 +117,9 @@ func getAPIHandler(conf api.Config) (http.Handler, api.Minio) {
 func getRPCHandler() http.Handler {
 	s := rpc.NewServer()
 	s.RegisterJSONCodec()
-	s.RegisterService(new(rpc.HelloService), "")
 	s.RegisterService(new(rpc.VersionService), "")
 	s.RegisterService(new(rpc.GetSysInfoService), "")
+	s.RegisterService(new(rpc.GetDiskInfoService), "")
 	// Add new services here
 	return registerRPC(router.NewRouter(), s)
 }

pkg/server/rpc/diskinfo.go

@@ -0,0 +1,58 @@
+/*
+ * Minimalist Object Storage, (C) 2015 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 rpc
+
+import (
+	"net/http"
+	"os"
+
+	"github.com/minio/minio/pkg/iodine"
+	"github.com/minio/minio/pkg/utils/scsi"
+)
+
+// GetDiskInfoService disk info service
+type GetDiskInfoService struct{}
+
+// GetDiskInfoReply disk info reply for disk info service
+type GetDiskInfoReply struct {
+	Hostname       string                     `json:"hostname"`
+	Disks          []string                   `json:"disks"`
+	DiskAttributes map[string]scsi.Attributes `json:"disk-attrs"`
+}
+
+func setDiskInfoReply(sis *GetDiskInfoReply) error {
+	var err error
+	sis.Hostname, err = os.Hostname()
+	if err != nil {
+		return iodine.New(err, nil)
+	}
+	disks, err := scsi.GetDisks()
+	if err != nil {
+		return iodine.New(err, nil)
+	}
+	sis.DiskAttributes = make(map[string]scsi.Attributes)
+	for k, v := range disks {
+		sis.Disks = append(sis.Disks, k)
+		sis.DiskAttributes[k] = v
+	}
+	return nil
+}
+
+// Get method
+func (s *GetDiskInfoService) Get(r *http.Request, args *Args, reply *GetDiskInfoReply) error {
+	return setDiskInfoReply(reply)
+}

pkg/server/rpc/sysinfo.go

@@ -20,61 +20,10 @@ import (
 	"net/http"
 	"os"
 	"runtime"
-	"time"
+
+	"github.com/minio/minio/pkg/iodine"
 )
 
-// HelloArgs - hello args
-type HelloArgs struct {
-	Who string
-}
-
-// HelloReply - hello reply
-type HelloReply struct {
-	Message string
-}
-
-// HelloService - hello service
-type HelloService struct{}
-
-// Say method
-func (h *HelloService) Say(r *http.Request, args *HelloArgs, reply *HelloReply) error {
-	reply.Message = "Hello, " + args.Who + "!"
-	return nil
-}
-
-// Args basic json RPC params
-type Args struct {
-	Request string
-}
-
-// VersionReply version reply
-type VersionReply struct {
-	Version   string `json:"version"`
-	BuildDate string `json:"build-date"`
-}
-
-// VersionService -
-type VersionService struct{}
-
-func getVersion() string {
-	return "0.0.1"
-}
-func getBuildDate() string {
-	return time.Now().UTC().Format(http.TimeFormat)
-}
-
-func setVersionReply(reply *VersionReply) {
-	reply.Version = getVersion()
-	reply.BuildDate = getBuildDate()
-	return
-}
-
-// Get method
-func (v *VersionService) Get(r *http.Request, args *Args, reply *VersionReply) error {
-	setVersionReply(reply)
-	return nil
-}
-
 // GetSysInfoService -
 type GetSysInfoService struct{}
 
@@ -95,7 +44,12 @@ func setSysInfoReply(sis *GetSysInfoReply) error {
 	sis.SysCPUS = runtime.NumCPU()
 	sis.Routines = runtime.NumGoroutine()
 	sis.GOVersion = runtime.Version()
-	sis.Hostname, _ = os.Hostname()
+
+	var err error
+	sis.Hostname, err = os.Hostname()
+	if err != nil {
+		return iodine.New(err, nil)
+	}
 
 	var memStats runtime.MemStats
 	runtime.ReadMemStats(&memStats)

pkg/server/rpc/version.go

@@ -0,0 +1,55 @@
+/*
+ * Minimalist Object Storage, (C) 2015 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 rpc
+
+import (
+	"net/http"
+	"time"
+)
+
+// Args basic json RPC params
+type Args struct {
+	Request string
+}
+
+// VersionReply version reply
+type VersionReply struct {
+	Version   string `json:"version"`
+	BuildDate string `json:"build-date"`
+}
+
+// VersionService -
+type VersionService struct{}
+
+func getVersion() string {
+	return "0.0.1"
+}
+func getBuildDate() string {
+	return time.Now().UTC().Format(http.TimeFormat)
+}
+
+func setVersionReply(reply *VersionReply) {
+	reply.Version = getVersion()
+	reply.BuildDate = getBuildDate()
+	return
+}
+
+// Get method
+func (v *VersionService) Get(r *http.Request, args *Args, reply *VersionReply) error {
+	setVersionReply(reply)
+	return nil
+}

pkg/server/server.go

@@ -22,6 +22,7 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/minio/minio/pkg/iodine"
 	"github.com/minio/minio/pkg/server/api"
 )
 
@@ -38,7 +39,7 @@ func startAPI(errCh chan error, conf api.Config, apiHandler http.Handler) {
 
 	host, port, err := net.SplitHostPort(conf.Address)
 	if err != nil {
-		errCh <- err
+		errCh <- iodine.New(err, nil)
 		return
 	}
 
@@ -49,7 +50,7 @@ func startAPI(errCh chan error, conf api.Config, apiHandler http.Handler) {
 	default:
 		addrs, err := net.InterfaceAddrs()
 		if err != nil {
-			errCh <- err
+			errCh <- iodine.New(err, nil)
 			return
 		}
 		for _, addr := range addrs {
@@ -109,8 +110,8 @@ func StartServices(conf api.Config) error {
 
 	select {
 	case err := <-apiErrCh:
-		return err
+		return iodine.New(err, nil)
 	case err := <-rpcErrCh:
-		return err
+		return iodine.New(err, nil)
 	}
 }