Cleanup DLQ on create-consumer-group error (#332)

uber-archive · Nov 30, 2017 · 8390176 · 8390176
1 parent 371b784
commit 8390176
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 24 deletions.
diff --git a/clients/metadata/metadata_cassandra.go b/clients/metadata/metadata_cassandra.go
@@ -206,18 +206,18 @@ func parseConsistency(cfgCons string) (lowCons gocql.Consistency, midCons gocql.
 
 	switch cons := strings.Split(cfgCons, ","); len(cons) {
 	case 3:
-		lowCons, _ = gocql.ParseConsistency(strings.TrimSpace(cons[2]))
+		lowCons = gocql.ParseConsistency(strings.TrimSpace(cons[2]))
 		fallthrough
 
 	case 2:
-		midCons, _ = gocql.ParseConsistency(strings.TrimSpace(cons[1]))
+		midCons = gocql.ParseConsistency(strings.TrimSpace(cons[1]))
 		if len(cons) == 2 {
 			lowCons = midCons
 		}
 		fallthrough
 
 	case 1:
-		highCons, _ = gocql.ParseConsistency(strings.TrimSpace(cons[0]))
+		highCons = gocql.ParseConsistency(strings.TrimSpace(cons[0]))
 	}
 
 	return
@@ -1350,6 +1350,18 @@ func (s *CassandraMetadataService) CreateConsumerGroupUUID(ctx thrift.Context, r
 
 	dstInfo, err := s.ReadDestination(nil, &shared.ReadDestinationRequest{Path: common.StringPtr(createRequest.GetDestinationPath())})
 	if err != nil {
+
+		if dlqUUID != nil {
+
+			if e := s.DeleteDestinationUUID(nil, &m.DeleteDestinationUUIDRequest{UUID: dlqUUID}); e != nil {
+				s.log.WithFields(bark.Fields{
+					common.TagDst:  *dlqUUID,
+					common.TagCnsm: cgUUID,
+					common.TagErr:  err,
+				}).Error(`CreateConsumerGroup - failed to cleanup DLQ destination`)
+			}
+		}
+
 		return nil, err
 	}
 	dstUUID := dstInfo.GetDestinationUUID()

diff --git a/cmd/tools/cmq/meta.go b/cmd/tools/cmq/meta.go
@@ -44,7 +44,7 @@ func newMetadataClient(opts *opts) (*metadataClient, error) {
 		}
 	}
 
-	cluster.Consistency, _ = gocql.ParseConsistency(opts.Consistency)
+	cluster.Consistency = gocql.ParseConsistency(opts.Consistency)
 
 	cluster.NumConns = numConns
 	cluster.ProtoVersion = protocolVersion

diff --git a/glide.lock b/glide.lock
diff --git a/tools/cassandra/cqlclient.go b/tools/cassandra/cqlclient.go
@@ -76,7 +76,7 @@ func newCQLClient(config *SchemaUpdaterConfig) (CQLClient, error) {
 	clusterCfg.Keyspace = config.Keyspace
 	clusterCfg.Timeout = defaultTimeout
 	clusterCfg.ProtoVersion = config.ProtoVersion
-	clusterCfg.Consistency, _ = gocql.ParseConsistency(defaultConsistency)
+	clusterCfg.Consistency = gocql.ParseConsistency(defaultConsistency)
 
 	if config.Username != "" && config.Password != "" {
 		clusterCfg.Authenticator = gocql.PasswordAuthenticator{