Fixes SG-Accel #27 add validateSgReaderDbConfig + validateSgAccelDbCo…

…nfig

Fixes https://github.com/couchbaselabs/sync-gateway-accel/issues/27

examples/sg-accel-index-reader.json

@@ -0,0 +1,30 @@
+{
+  "interface":":4984",
+  "adminInterface":"0.0.0.0:4985",
+  "maxIncomingConnections":0,
+  "maxCouchbaseConnections":16,
+  "maxFileDescriptors":90000,
+  "slowServerCallWarningThreshold":500,
+  "compressResponses":true,
+  "log":[
+    "*"
+  ],
+  "cluster_config":{
+    "server":"http://127.0.0.1:8091",
+    "data_dir":".",
+    "bucket":"data-bucket"
+  },
+  "databases":{
+    "db":{
+      "feed_type":"DCPSHARD",
+      "server":"http://127.0.0.1:8091",
+      "bucket":"data-bucket",
+      "revs_limit":25,
+      "channel_index":{
+        "server":"http://127.0.0.1:8091",
+        "bucket":"index-bucket",
+        "writer":false
+      }
+    }
+  }
+}

examples/sg-accel-index-writer.json

@@ -0,0 +1,30 @@
+{
+  "interface":":4984",
+  "adminInterface":"0.0.0.0:4985",
+  "maxIncomingConnections":0,
+  "maxCouchbaseConnections":16,
+  "maxFileDescriptors":90000,
+  "slowServerCallWarningThreshold":500,
+  "compressResponses":true,
+  "log":[
+    "*"
+  ],
+  "cluster_config":{
+    "server":"http://127.0.0.1:8091",
+    "data_dir":".",
+    "bucket":"data-bucket"
+  },
+  "databases":{
+    "db":{
+      "feed_type":"DCPSHARD",
+      "server":"http://127.0.0.1:8091",
+      "bucket":"data-bucket",
+      "revs_limit":25,
+      "channel_index":{
+        "server":"http://127.0.0.1:8091",
+        "bucket":"index-bucket",
+        "writer":true
+      }
+    }
+  }
+}

rest/config.go

@@ -86,6 +86,7 @@ type ServerConfig struct {
 	ClusterConfig                  *ClusterConfig           `json:"cluster_config,omitempty"`          // Bucket and other config related to CBGT
 	SkipRunmodeValidation          bool                     `json:"skip_runmode_validation,omitempty"` // If this is true, skips any config validation regarding accel vs normal mode
 	Unsupported                    *UnsupportedServerConfig `json:"unsupported,omitempty"`             // Config for unsupported features
+	RunMode                        SyncGatewayRunMode       `json:"runmode,omitempty"`                 // Whether this is an SG reader or an SG Accelerator
 }
 
 // Bucket configuration elements - used by db, shadow, index
@@ -299,6 +300,43 @@ func (dbConfig DbConfig) validate() error {
 
 }
 
+func (dbConfig *DbConfig) validateSgReaderDbConfig() error {
+
+	if err := dbConfig.validate(); err != nil {
+		return err
+	}
+
+	if dbConfig.ChannelIndex.IndexWriter == true {
+		return fmt.Errorf("Invalid configuration for Sync Gw.  Must not be configured as an IndexWriter")
+	}
+
+	return nil
+
+}
+
+func (dbConfig *DbConfig) validateSgAccelDbConfig() error {
+
+	if err := dbConfig.validate(); err != nil {
+		return err
+	}
+
+	if dbConfig.ChannelIndex == nil {
+		return fmt.Errorf("Invalid configuration for Sync Gw Accel.  Must have a ChannelIndex defined")
+	}
+
+	if dbConfig.ChannelIndex.IndexWriter == false {
+		return fmt.Errorf("Invalid configuration for Sync Gw Accel.  Must be configured as an IndexWriter")
+	}
+
+	if strings.ToLower(dbConfig.FeedType) != strings.ToLower(base.DcpShardFeedType) {
+		return fmt.Errorf("Invalid configuration for Sync Gw Accel.  Must be configured for DCPSHARD feedtype")
+
+	}
+
+	return nil
+
+}
+
 func (dbConfig *DbConfig) modifyConfig() {
 	if dbConfig.ChannelIndex != nil {
 		// if there is NO feed type, set to DCPSHARD, since that's the only
@@ -325,14 +363,16 @@ func (channelIndexConfig *ChannelIndexConfig) GetCredentials() (string, string,
 }
 
 // Reads a ServerConfig from raw data
-func ReadServerConfigFromData(data []byte) (*ServerConfig, error) {
+func ReadServerConfigFromData(runMode SyncGatewayRunMode, data []byte) (*ServerConfig, error) {
 
 	data = base.ConvertBackQuotedStrings(data)
 	var config *ServerConfig
 	if err := json.Unmarshal(data, &config); err != nil {
 		return nil, err
 	}
 
+	config.RunMode = runMode
+
 	// Validation:
 	if err := config.setupAndValidateDatabases(); err != nil {
 		return nil, err
@@ -342,7 +382,7 @@ func ReadServerConfigFromData(data []byte) (*ServerConfig, error) {
 }
 
 // Reads a ServerConfig from a URL.
-func ReadServerConfigFromUrl(url string) (*ServerConfig, error) {
+func ReadServerConfigFromUrl(runMode SyncGatewayRunMode, url string) (*ServerConfig, error) {
 
 	resp, err := http.Get(url)
 	if err != nil {
@@ -353,21 +393,21 @@ func ReadServerConfigFromUrl(url string) (*ServerConfig, error) {
 	if err != nil {
 		return nil, err
 	}
-	return ReadServerConfigFromData(responseBody)
+	return ReadServerConfigFromData(runMode, responseBody)
 
 }
 
 // Reads a ServerConfig from either a JSON file or from a URL.
-func ReadServerConfig(path string) (*ServerConfig, error) {
+func ReadServerConfig(runMode SyncGatewayRunMode, path string) (*ServerConfig, error) {
 	if strings.HasPrefix(path, "http://") || strings.HasPrefix(path, "https://") {
-		return ReadServerConfigFromUrl(path)
+		return ReadServerConfigFromUrl(runMode, path)
 	} else {
-		return ReadServerConfigFromFile(path)
+		return ReadServerConfigFromFile(runMode, path)
 	}
 }
 
 // Reads a ServerConfig from a JSON file.
-func ReadServerConfigFromFile(path string) (*ServerConfig, error) {
+func ReadServerConfigFromFile(runMode SyncGatewayRunMode, path string) (*ServerConfig, error) {
 	file, err := os.Open(path)
 	if err != nil {
 		return nil, err
@@ -384,6 +424,8 @@ func ReadServerConfigFromFile(path string) (*ServerConfig, error) {
 		return nil, err
 	}
 
+	config.RunMode = runMode
+
 	// Validation:
 	if err := config.setupAndValidateDatabases(); err != nil {
 		return nil, err
@@ -433,9 +475,16 @@ func (config *ServerConfig) setupAndValidateLogging(verbose bool) error {
 
 func (config *ServerConfig) validateDbConfig(dbConfig *DbConfig) error {
 
-	dbConfig.modifyConfig()
+	dbConfig.modifyConfig() // TODO: review this
+
+	switch config.RunMode {
+	case SyncGatewayRunModeNormal:
+		return dbConfig.validateSgReaderDbConfig()
+	case SyncGatewayRunModeAccel:
+		return dbConfig.validateSgAccelDbConfig()
+	}
 
-	return dbConfig.validate()
+	return fmt.Errorf("Unexpected RunMode: %v", config.RunMode)
 
 }
 
@@ -477,7 +526,7 @@ func (self *ServerConfig) MergeWith(other *ServerConfig) error {
 }
 
 // Reads the command line flags and the optional config file.
-func ParseCommandLine() {
+func ParseCommandLine(runMode SyncGatewayRunMode) {
 	addr := flag.String("interface", DefaultInterface, "Address to bind to")
 	authAddr := flag.String("adminInterface", DefaultAdminInterface, "Address to bind admin interface to")
 	profAddr := flag.String("profileInterface", "", "Address to bind profile interface to")
@@ -499,7 +548,7 @@ func ParseCommandLine() {
 		// Read the configuration file(s), if any:
 		for i := 0; i < flag.NArg(); i++ {
 			filename := flag.Arg(i)
-			c, err := ReadServerConfig(filename)
+			c, err := ReadServerConfig(runMode, filename)
 			if err != nil {
 				base.LogFatal("Error reading config file %s: %v", filename, err)
 			}
@@ -743,7 +792,7 @@ func ValidateConfigOrPanic(runMode SyncGatewayRunMode) {
 // Main entry point for a simple server; you can have your main() function just call this.
 // It parses command-line flags, reads the optional configuration file, then starts the server.
 func ServerMain(runMode SyncGatewayRunMode) {
-	ParseCommandLine()
+	ParseCommandLine(runMode)
 	ValidateConfigOrPanic(runMode)
 	RunServer(config)
 }