Skip to content

Commit

Permalink
Fix RemoveDeadRooms delete metric reason (#105)
Browse files Browse the repository at this point in the history
* Fix RemoveDeadRooms delete metric reason

When RemoveDeadRooms deletes a room it is reported with a reason
as "update". Now RemoveDeadRooms will report the reason as "ping_timeout"
when it deletes pods.

* Use reason parameter in DeletePodAndRoom
  • Loading branch information
victor-carvalho committed Sep 22, 2020
1 parent 57b9163 commit f6acb41
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
6 changes: 4 additions & 2 deletions controller/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,7 @@ func createNewRemoveOldPod(

canceled, err = DeletePodsAndWait(
ctx,
reportersConstants.ReasonUpdate,
logger,
roomManager,
mr,
Expand Down Expand Up @@ -332,6 +333,7 @@ func createNewRemoveOldPod(
// DeletePodsAndWait deletes a list of pods
func DeletePodsAndWait(
ctx context.Context,
reason string,
logger logrus.FieldLogger,
roomManager models.RoomManager,
mr *models.MixedMetricsReporter,
Expand All @@ -344,7 +346,7 @@ func DeletePodsAndWait(
for _, pod := range pods {
logger.Debugf("deleting pod %s", pod.Name)
err = DeletePodAndRoom(logger, roomManager, mr, clientset, redisClient,
configYAML, pod.Name, reportersConstants.ReasonUpdate)
configYAML, pod.Name, reason)
if err != nil && !strings.Contains(err.Error(), "redis") {
logger.WithError(err).Errorf("error deleting pod %s", pod.Name)
return false, nil
Expand Down Expand Up @@ -642,7 +644,7 @@ func DeletePodAndRoom(
}

err = roomManager.Delete(logger, mr, clientset, redisClient, configYaml,
pod.Name, reportersConstants.ReasonUpdate)
pod.Name, reason)
if err != nil && !strings.Contains(err.Error(), "not found") {
logger.
WithField("roomName", pod.Name).
Expand Down
1 change: 1 addition & 0 deletions watcher/watcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,7 @@ func (w *Watcher) RemoveDeadRooms() error {
var timeoutErr bool
timedout, err := controller.DeletePodsAndWait(
ctx,
reportersConstants.ReasonPingTimeout,
logger,
w.RoomManager,
w.MetricsReporter,
Expand Down

0 comments on commit f6acb41

Please sign in to comment.