Merge pull request #97 from gyuho/remove

agent: remove Restart operation

agent/agent.go

@@ -170,7 +170,7 @@ var uploadSig = make(chan Request_Operation, 1)
 
 func (t *transporterServer) Transfer(ctx context.Context, r *Request) (*Response, error) {
 	peerIPs := strings.Split(r.PeerIPString, "___")
-	if r.Operation == Request_Start || r.Operation == Request_Restart {
+	if r.Operation == Request_Start {
 		if !filepath.HasPrefix(etcdDataDir, globalFlags.WorkingDirectory) {
 			etcdDataDir = filepath.Join(globalFlags.WorkingDirectory, etcdDataDir)
 		}
@@ -466,45 +466,6 @@ func (t *transporterServer) Transfer(ctx context.Context, r *Request) (*Response
 			return nil, fmt.Errorf("unknown database %q", r.Database)
 		}
 
-	case Request_Restart: // TODO: proxy is not supported!
-		if t.cmd == nil {
-			return nil, fmt.Errorf("nil command")
-		}
-
-		plog.Infof("restarting database %q", t.req.Database.String())
-		if r.Database == Request_ZooKeeper {
-			if err := os.Chdir(zkWorkingDir); err != nil {
-				return nil, err
-			}
-		}
-
-		f, err := openToAppend(databaseLogPath)
-		if err != nil {
-			return nil, err
-		}
-		t.logfile = f
-
-		cmd := exec.Command(t.cmd.Path, t.cmd.Args[1:]...)
-		cmd.Stdout = f
-		cmd.Stderr = f
-
-		cmdString := strings.Join(t.cmd.Args, " ")
-		plog.Infof("restarting binary %q", cmdString)
-		if err := cmd.Start(); err != nil {
-			return nil, err
-		}
-		t.cmd = cmd
-		t.pid = cmd.Process.Pid
-		plog.Infof("restarted binary %q [PID: %d]", cmdString, t.pid)
-		processPID = t.pid
-		go func() {
-			if err := cmd.Wait(); err != nil {
-				plog.Errorf("cmd.Wait %q returned error (%v)", cmdString, err)
-				return
-			}
-			plog.Infof("exiting %q", cmdString)
-		}()
-
 	case Request_Stop:
 		time.Sleep(3 * time.Second) // wait a few more seconds to collect more monitoring data
 		if t.cmd == nil {
@@ -542,7 +503,7 @@ func (t *transporterServer) Transfer(ctx context.Context, r *Request) (*Response
 		return nil, fmt.Errorf("Not implemented %v", r.Operation)
 	}
 
-	if r.Operation == Request_Start || r.Operation == Request_Restart {
+	if r.Operation == Request_Start {
 		go func(processPID int) {
 			notifier := make(chan os.Signal, 1)
 			signal.Notify(notifier, syscall.SIGINT, syscall.SIGTERM)

agent/message.pb.go

@@ -42,20 +42,17 @@ type Request_Operation int32
 const (
 	Request_Start     Request_Operation = 0
 	Request_Stop      Request_Operation = 1
-	Request_Restart   Request_Operation = 2
 	Request_UploadLog Request_Operation = 3
 )
 
 var Request_Operation_name = map[int32]string{
 	0: "Start",
 	1: "Stop",
-	2: "Restart",
 	3: "UploadLog",
 }
 var Request_Operation_value = map[string]int32{
 	"Start":     0,
 	"Stop":      1,
-	"Restart":   2,
 	"UploadLog": 3,
 }
 
@@ -943,38 +940,38 @@ var (
 func init() { proto.RegisterFile("agent/message.proto", fileDescriptorMessage) }
 
 var fileDescriptorMessage = []byte{
-	// 528 bytes of a gzipped FileDescriptorProto
+	// 519 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x93, 0xcf, 0x4e, 0xdb, 0x4c,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x93, 0xcd, 0x6e, 0xd3, 0x40,
-	0x14, 0xc5, 0x63, 0x42, 0xc0, 0xbe, 0x01, 0x3e, 0x6b, 0xbe, 0xb6, 0x8c, 0x50, 0x65, 0x45, 0x16,
+	0x14, 0x85, 0xe3, 0xa6, 0x69, 0xed, 0xdb, 0x1f, 0xac, 0xe1, 0xa7, 0xa3, 0x0a, 0x59, 0x91, 0xd5,
-	0x8b, 0x6c, 0x30, 0x12, 0x54, 0xa8, 0x0b, 0x56, 0x24, 0xaa, 0x14, 0xd1, 0x3f, 0xc8, 0x6e, 0x37,
+	0x45, 0x36, 0x75, 0xa4, 0x06, 0x55, 0x2c, 0x58, 0x25, 0x11, 0x52, 0x54, 0x7e, 0x2a, 0x1b, 0x36,
-	0xdd, 0x4d, 0x9c, 0x8b, 0x9b, 0x92, 0xcc, 0x75, 0x67, 0xc6, 0x28, 0xe1, 0x49, 0xfa, 0x48, 0x2c,
+	0xec, 0x26, 0xce, 0xad, 0x09, 0x4d, 0xe6, 0x9a, 0x99, 0x71, 0x95, 0xf4, 0x49, 0x78, 0xa4, 0x2e,
-	0xfb, 0x08, 0x6d, 0xfa, 0x0c, 0xdd, 0x57, 0x9e, 0x10, 0x43, 0x0a, 0xb4, 0xbb, 0x7b, 0xce, 0xef,
+	0x79, 0x04, 0x08, 0x1b, 0x1e, 0x03, 0x65, 0xd2, 0xb8, 0x0d, 0x6d, 0x61, 0x77, 0xcf, 0xf9, 0xce,
-	0x9c, 0x3b, 0x92, 0x75, 0x0d, 0xff, 0x8b, 0x0c, 0xa5, 0xd9, 0x1f, 0xa3, 0xd6, 0x22, 0xc3, 0x28,
+	0xb9, 0x23, 0x59, 0xd7, 0xf0, 0x58, 0x64, 0x28, 0x4d, 0x73, 0x8c, 0x5a, 0x8b, 0x0c, 0xa3, 0x5c,
-	0x57, 0x64, 0x88, 0x35, 0xac, 0xb9, 0xb3, 0x97, 0x0d, 0xcd, 0xa7, 0xa2, 0x1f, 0xa5, 0x34, 0xde,
+	0x91, 0x21, 0x56, 0xb3, 0xe6, 0xfe, 0x61, 0x36, 0x34, 0x9f, 0x8b, 0x7e, 0x94, 0xd2, 0xb8, 0x99,
-	0xcf, 0x28, 0xa3, 0x7d, 0x4b, 0xfb, 0xc5, 0xb9, 0x55, 0x56, 0xd8, 0x69, 0xde, 0x0a, 0x7f, 0x35,
+	0x51, 0x46, 0x4d, 0x4b, 0xfb, 0xc5, 0x99, 0x55, 0x56, 0xd8, 0x69, 0xd1, 0x0a, 0x7f, 0xd7, 0x60,
-	0x60, 0x3d, 0xc6, 0x2f, 0x05, 0x6a, 0xc3, 0x8e, 0xc0, 0xa3, 0x1c, 0x95, 0x30, 0x43, 0x92, 0xdc,
+	0x33, 0xc6, 0xaf, 0x05, 0x6a, 0xc3, 0x8e, 0xc1, 0xa3, 0x1c, 0x95, 0x30, 0x43, 0x92, 0xdc, 0xa9,
-	0x69, 0x39, 0xed, 0xad, 0x03, 0x1e, 0xd9, 0xad, 0xd1, 0x4d, 0x24, 0x7a, 0xb7, 0xe0, 0xf1, 0x6d,
+	0x3b, 0x8d, 0xdd, 0x23, 0x1e, 0xd9, 0xad, 0xd1, 0x75, 0x24, 0x7a, 0xbf, 0xe4, 0xf1, 0x4d, 0x94,
-	0x94, 0x1d, 0x82, 0x3b, 0x10, 0x46, 0xf4, 0x85, 0x46, 0xbe, 0x62, 0x6b, 0xdb, 0x7f, 0xd4, 0xba,
+	0xb5, 0xc0, 0x1d, 0x08, 0x23, 0xfa, 0x42, 0x23, 0x5f, 0xb3, 0xb5, 0xbd, 0xbf, 0x6a, 0xdd, 0x6b,
-	0x37, 0x38, 0xae, 0x82, 0x2c, 0x84, 0x8d, 0x1c, 0x51, 0xf5, 0xce, 0x12, 0xa3, 0x86, 0x32, 0xe3,
+	0x1c, 0x97, 0x41, 0x16, 0xc2, 0x76, 0x8e, 0xa8, 0x7a, 0xa7, 0x89, 0x51, 0x43, 0x99, 0xf1, 0x6a,
-	0xf5, 0x96, 0xd3, 0xf6, 0xe2, 0x25, 0x8f, 0xb5, 0xa0, 0xa9, 0x51, 0x5d, 0xa2, 0xea, 0xc9, 0x01,
+	0xdd, 0x69, 0x78, 0xf1, 0x8a, 0xc7, 0xea, 0xb0, 0xa5, 0x51, 0x5d, 0xa0, 0xea, 0xc9, 0x01, 0x4e,
-	0x4e, 0xf8, 0x6a, 0xcb, 0x69, 0x6f, 0xc6, 0x77, 0x2d, 0xb6, 0x03, 0xae, 0x41, 0x6d, 0xde, 0x8a,
+	0xf8, 0x7a, 0xdd, 0x69, 0xec, 0xc4, 0xb7, 0x2d, 0xb6, 0x0f, 0xae, 0x41, 0x6d, 0xde, 0x89, 0x31,
-	0x31, 0xf2, 0x86, 0xdd, 0x50, 0x69, 0x76, 0x04, 0xcf, 0x32, 0xa2, 0x6c, 0x84, 0x9d, 0x11, 0x15,
+	0xf2, 0x9a, 0xdd, 0x50, 0x6a, 0x76, 0x0c, 0xcf, 0x32, 0xa2, 0x6c, 0x84, 0x9d, 0x11, 0x15, 0x83,
-	0x83, 0x33, 0x45, 0x9f, 0x31, 0x9d, 0x27, 0xd7, 0x6c, 0xf2, 0x11, 0xca, 0x5e, 0xc0, 0xd3, 0x3b,
+	0x53, 0x45, 0x5f, 0x30, 0x5d, 0x24, 0x37, 0x6c, 0xf2, 0x01, 0xca, 0x5e, 0xc0, 0xd3, 0x5b, 0x24,
-	0x24, 0x31, 0xa4, 0x44, 0x86, 0xa7, 0x38, 0xe5, 0xeb, 0xb6, 0xf6, 0x30, 0x64, 0x27, 0xf0, 0xfc,
+	0x31, 0xa4, 0x44, 0x86, 0x27, 0x38, 0xe5, 0x9b, 0xb6, 0x76, 0x3f, 0x64, 0x6d, 0x78, 0x7e, 0x17,
-	0x3e, 0x38, 0x29, 0xd2, 0x0b, 0x9c, 0xbf, 0xe9, 0xda, 0xf2, 0x5f, 0x33, 0xec, 0x15, 0x04, 0xf7,
+	0xb4, 0x8b, 0xf4, 0x1c, 0x17, 0x6f, 0xba, 0xb6, 0xfc, 0xcf, 0x0c, 0x7b, 0x0d, 0xc1, 0x5d, 0x9e,
-	0x79, 0x52, 0xf4, 0xbb, 0x43, 0x85, 0xa9, 0x21, 0x35, 0xe5, 0x9e, 0xdd, 0xf2, 0x8f, 0x14, 0xdb,
+	0x14, 0xfd, 0xee, 0x50, 0x61, 0x6a, 0x48, 0x4d, 0xb9, 0x67, 0xb7, 0xfc, 0x27, 0xc5, 0x0e, 0x60,
-	0x85, 0xcd, 0x2b, 0xa2, 0x0b, 0xc4, 0x1c, 0xd5, 0x9b, 0x69, 0xaf, 0xcb, 0xc1, 0x7e, 0xb9, 0x65,
+	0xe7, 0x92, 0xe8, 0x1c, 0x31, 0x47, 0xf5, 0x76, 0xda, 0xeb, 0x72, 0xb0, 0x5f, 0x6e, 0xd5, 0x64,
-	0x93, 0xbd, 0x84, 0xed, 0x5b, 0x43, 0x4c, 0x3a, 0xa3, 0x21, 0x4a, 0xd3, 0x91, 0x13, 0xa9, 0x79,
+	0x2f, 0x61, 0xef, 0xc6, 0x10, 0x93, 0xce, 0x68, 0x88, 0xd2, 0x74, 0xe4, 0x44, 0x6a, 0xbe, 0x55,
-	0xb3, 0xe5, 0xb4, 0xeb, 0xf1, 0x63, 0x98, 0x45, 0xc0, 0x2a, 0x94, 0x48, 0x91, 0x77, 0xa8, 0x90,
+	0x77, 0x1a, 0xd5, 0xf8, 0x21, 0xcc, 0x22, 0x60, 0x25, 0x4a, 0xa4, 0xc8, 0x3b, 0x54, 0x48, 0xc3,
-	0x86, 0x6f, 0xd8, 0xd2, 0x03, 0x24, 0x3c, 0x06, 0xaf, 0x3a, 0x1c, 0xe6, 0x41, 0x23, 0x31, 0x42,
+	0xb7, 0x6d, 0xe9, 0x1e, 0x12, 0x36, 0xc1, 0x2b, 0x0f, 0x87, 0x79, 0x50, 0x4b, 0x8c, 0x50, 0xc6,
-	0x19, 0xbf, 0xc6, 0x5c, 0x58, 0x4d, 0x0c, 0xe5, 0xbe, 0xc3, 0x9a, 0xe5, 0x15, 0x6a, 0x6b, 0xaf,
+	0xaf, 0x30, 0x17, 0xd6, 0x13, 0x43, 0xb9, 0xef, 0xb0, 0x1d, 0xf0, 0x3e, 0xe6, 0x23, 0x12, 0x83,
-	0xb0, 0x4d, 0xf0, 0x3e, 0xe4, 0x23, 0x12, 0x83, 0xd7, 0x94, 0xf9, 0xf5, 0x30, 0x01, 0x77, 0x71,
+	0x37, 0x94, 0xf9, 0xd5, 0x30, 0x01, 0x77, 0x79, 0x32, 0x0c, 0x60, 0x03, 0x4d, 0x3a, 0xb8, 0x68,
-	0x3f, 0x0c, 0x60, 0x0d, 0x4d, 0x3a, 0xb8, 0x3c, 0xf4, 0x6b, 0xd5, 0x7c, 0xe0, 0x3b, 0x65, 0xe5,
+	0xf9, 0x95, 0x72, 0x3e, 0x5a, 0x54, 0x3e, 0x11, 0x9d, 0xd8, 0xa7, 0xfc, 0xb5, 0x39, 0xea, 0x90,
-	0x23, 0xd1, 0xa9, 0x7d, 0xd7, 0x5f, 0x29, 0x51, 0x87, 0xa4, 0x2e, 0x46, 0x7e, 0xbd, 0x7c, 0xef,
+	0xd4, 0xc5, 0xc8, 0xaf, 0xce, 0x9f, 0xb8, 0x9c, 0xe7, 0xfc, 0xf5, 0xf9, 0x98, 0xda, 0xb1, 0x16,
-	0xaa, 0xcc, 0xf9, 0xab, 0xe5, 0x98, 0xda, 0xb1, 0x11, 0xee, 0x82, 0x1b, 0xa3, 0xce, 0x49, 0x6a,
+	0x1e, 0x80, 0x1b, 0xa3, 0xce, 0x49, 0x6a, 0x64, 0x1c, 0x36, 0x75, 0x91, 0xa6, 0xa8, 0xb5, 0x3d,
-	0x64, 0x1c, 0xd6, 0x75, 0x91, 0xa6, 0xa8, 0xb5, 0xbd, 0x7a, 0x37, 0x5e, 0xc8, 0x83, 0x63, 0x68,
+	0x74, 0x37, 0x5e, 0xca, 0xa3, 0x57, 0xb0, 0xf5, 0x41, 0x09, 0xa9, 0x73, 0x52, 0x06, 0x15, 0x3b,
-	0xbe, 0x57, 0x42, 0xea, 0x9c, 0x94, 0x41, 0xc5, 0xf6, 0xc0, 0xb5, 0xf2, 0x1c, 0x15, 0xdb, 0x5a,
+	0x04, 0xd7, 0xca, 0x33, 0x54, 0x6c, 0x77, 0xf5, 0xaa, 0xf7, 0x1f, 0x95, 0x7a, 0xb1, 0x35, 0xac,
-	0x3e, 0xf1, 0x9d, 0xff, 0x2a, 0x3d, 0xdf, 0x1a, 0xd6, 0x4e, 0x9e, 0x5c, 0xff, 0x08, 0x6a, 0xd7,
+	0xb4, 0x9f, 0x5c, 0xfd, 0x0c, 0x2a, 0x57, 0xb3, 0xc0, 0xf9, 0x3e, 0x0b, 0x9c, 0x1f, 0xb3, 0xc0,
-	0xb3, 0xc0, 0xf9, 0x36, 0x0b, 0x9c, 0xef, 0xb3, 0xc0, 0xf9, 0xfa, 0x33, 0xa8, 0xf5, 0xd7, 0xec,
+	0xf9, 0xf6, 0x2b, 0xa8, 0xf4, 0x37, 0xec, 0xbf, 0xd6, 0xfa, 0x13, 0x00, 0x00, 0xff, 0xff, 0x2f,
-	0x8f, 0x77, 0xf8, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x0a, 0xb2, 0x57, 0xe6, 0xc5, 0x03, 0x00, 0x00,
+	0xc9, 0x22, 0xaf, 0xb8, 0x03, 0x00, 0x00,
 }

agent/message.proto

@@ -16,7 +16,6 @@ message Request {
 	enum Operation {
 		Start     = 0;
 		Stop      = 1;
-		Restart   = 2;
 		UploadLog = 3;
 	}
 	enum Database {