only print when validating alter commands (otherwise result might be …

…incorrect)
deviceinsight · Dec 8, 2020 · b53c79f · b53c79f
1 parent 170aa48
commit b53c79f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 14 deletions.
diff --git a/.github/workflows/lint_test.yml b/.github/workflows/lint_test.yml
@@ -52,6 +52,7 @@ jobs:
     env:
       CP_VERSION: ${{ matrix.cp_version }}
       KAFKAVERSION: ${{ matrix.kafka_version }}
+      WAIT_FOR_KAFKA_TIMEOUT: 480
       REQUESTTIMEOUT: 15s
     steps:
       - uses: actions/checkout@v2

diff --git a/operations/partitions/partition-operation.go b/operations/partitions/partition-operation.go
@@ -111,22 +111,22 @@ func (operation *PartitionOperation) AlterPartition(topic string, partitionId in
 
 				if statusTopic, ok := status[topic]; ok {
 					if statusPartition, ok := statusTopic[partitionId]; ok {
-						output.Debugf("Reassignment running: %s:%d replicas: %v addingReplicas: %v removingReplicas: %v",
+						output.Infof("reassignment running for topic=%s partition=%d: replicas:%v addingReplicas:%v removingReplicas:%v",
 							topic, partitionId, statusPartition.Replicas, statusPartition.AddingReplicas, statusPartition.RemovingReplicas)
-						time.Sleep(2 * time.Second)
+						time.Sleep(5 * time.Second)
 						assignmentRunning = true
 					}
 				}
 			}
+			output.Infof("partition replicas have been reassigned")
 		}
 	}
 
-	if !flags.ValidateOnly {
-		if partition, err = readPartition(&client, topic, partitionId); err != nil {
-			return err
-		}
+	if flags.ValidateOnly {
+		return printPartition(partition)
+	} else {
+		return nil
 	}
-	return printPartition(partition)
 }
 
 func printPartition(p partition) error {

diff --git a/operations/topic-operation.go b/operations/topic-operation.go
@@ -272,6 +272,8 @@ func (operation *TopicOperation) AlterTopic(topic string, flags AlterTopicFlags)
 			err = admin.CreatePartitions(topic, flags.Partitions, emptyAssignment, flags.ValidateOnly)
 			if err != nil {
 				return errors.Errorf("Could not create partitions for topic '%s': %v", topic, err)
+			} else {
+				output.Infof("partitions have been created")
 			}
 		}
 	}
@@ -338,15 +340,17 @@ func (operation *TopicOperation) AlterTopic(topic string, flags AlterTopicFlags)
 
 				if statusTopic, ok := status[topic]; ok {
 					for partitionId, statusPartition := range statusTopic {
-						output.Debugf("Reassignment running: %s:%d replicas: %v addingReplicas: %v removingReplicas: %v",
+						output.Infof("reassignment running for topic=%s partition=%d: replicas:%v addingReplicas:%v removingReplicas:%v",
 							topic, partitionId, statusPartition.Replicas, statusPartition.AddingReplicas, statusPartition.RemovingReplicas)
-						time.Sleep(2 * time.Second)
+						time.Sleep(5 * time.Second)
 						assignmentRunning = true
 					}
 				} else {
 					output.Debugf("Emtpy list partition reassignment result returned (len status: %d)", len(status))
 				}
 			}
+
+			output.Infof("partition replicas have been reassigned")
 		}
 	}
 
@@ -378,16 +382,18 @@ func (operation *TopicOperation) AlterTopic(topic string, flags AlterTopicFlags)
 		} else {
 			if err = admin.AlterConfig(sarama.TopicResource, topic, mergedConfigEntries, flags.ValidateOnly); err != nil {
 				return errors.Errorf("Could not alter topic config '%s': %v", topic, err)
+			} else {
+				output.Infof("config has been altered")
 			}
 		}
 	}
 
-	if !flags.ValidateOnly {
-		t, _ = readTopic(&client, &admin, topic, allFields)
+	if flags.ValidateOnly {
+		describeFlags := DescribeTopicFlags{PrintConfigs: len(flags.Configs) > 0}
+		return operation.printTopic(t, describeFlags)
+	} else {
+		return nil
 	}
-
-	describeFlags := DescribeTopicFlags{PrintConfigs: len(flags.Configs) > 0}
-	return operation.printTopic(t, describeFlags)
 }
 
 func (operation *TopicOperation) ListTopicsNames() ([]string, error) {