Skip to content
This repository was archived by the owner on Aug 23, 2023. It is now read-only.

idx: better log msg formatting, include more info #1119

Merged
merged 2 commits into from
Oct 26, 2018
Merged

idx: better log msg formatting, include more info #1119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bde7157
idx: better log msg formatting, include more info
Dieterbe Oct 26, 2018
281c3dd
caller will log error so intermediate is only warn
Dieterbe Oct 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions idx/bigtable/bigtable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@ func (b *BigtableIdx) InitBare() error {
if b.cfg.CreateCF {
adminClient, err := bigtable.NewAdminClient(ctx, b.cfg.GcpProject, b.cfg.BigtableInstance)
if err != nil {
log.Errorf("bigtable-idx: failed to create bigtable admin client. %s", err)
log.Errorf("bigtable-idx: failed to create bigtable admin client: %s", err)
return err
}
tables, err := adminClient.Tables(ctx)
if err != nil {
log.Errorf("bigtable-idx: failed to list tables. %s", err)
log.Errorf("bigtable-idx: failed to list tables: %s", err)
return err
}
found := false
Expand All @@ -103,7 +103,7 @@ func (b *BigtableIdx) InitBare() error {
}
}
if !found {
log.Infof("bigtable-idx: table %s does not yet exist. Creating it.", b.cfg.TableName)
log.Infof("bigtable-idx: table %q does not yet exist. Creating it.", b.cfg.TableName)
table := bigtable.TableConf{
TableID: b.cfg.TableName,
Families: map[string]bigtable.GCPolicy{
Expand All @@ -112,15 +112,15 @@ func (b *BigtableIdx) InitBare() error {
}
err := adminClient.CreateTableFromConf(ctx, &table)
if err != nil {
log.Errorf("bigtable-idx: failed to create %s table. %s", b.cfg.TableName, err)
log.Errorf("bigtable-idx: failed to create table %q: %s", b.cfg.TableName, err)
return err
}
} else {
log.Infof("bigtable-idx: table %s exists.", b.cfg.TableName)
// table exists. Lets make sure that it has all of the CF's we need.
table, err := adminClient.TableInfo(ctx, b.cfg.TableName)
if err != nil {
log.Errorf("bigtable-idx: failed to get tableInfo of %s. %s", b.cfg.TableName, err)
log.Errorf("bigtable-idx: failed to get tableInfo of %q: %s", b.cfg.TableName, err)
return err
}
existingFamilies := make(map[string]string)
Expand All @@ -132,27 +132,27 @@ func (b *BigtableIdx) InitBare() error {
log.Infof("bigtable-idx: column family %s/%s does not exist. Creating it.", b.cfg.TableName, COLUMN_FAMILY)
err = adminClient.CreateColumnFamily(ctx, b.cfg.TableName, COLUMN_FAMILY)
if err != nil {
log.Errorf("bigtable-idx: failed to create cf %s/%s. %s", b.cfg.TableName, COLUMN_FAMILY, err)
log.Errorf("bigtable-idx: failed to create cf %s/%s: %s", b.cfg.TableName, COLUMN_FAMILY, err)
return err
}
err = adminClient.SetGCPolicy(ctx, b.cfg.TableName, COLUMN_FAMILY, bigtable.MaxVersionsPolicy(1))
if err != nil {
log.Errorf("bigtable-idx: failed to set GCPolicy of %s/%s. %s", b.cfg.TableName, COLUMN_FAMILY, err)
log.Errorf("bigtable-idx: failed to set GCPolicy of %s/%s: %s", b.cfg.TableName, COLUMN_FAMILY, err)
return err
}
} else if policy == "" {
log.Infof("bigtable-idx: column family %s/%s exists but has no GCPolicy. Creating it.", b.cfg.TableName, COLUMN_FAMILY)
err = adminClient.SetGCPolicy(ctx, b.cfg.TableName, COLUMN_FAMILY, bigtable.MaxVersionsPolicy(1))
if err != nil {
log.Errorf("bigtable-idx: failed to set GCPolicy of %s/%s. %s", b.cfg.TableName, COLUMN_FAMILY, err)
log.Errorf("bigtable-idx: failed to set GCPolicy of %s/%s: %s", b.cfg.TableName, COLUMN_FAMILY, err)
return err
}
}
}
}
client, err := bigtable.NewClient(ctx, b.cfg.GcpProject, b.cfg.BigtableInstance)
if err != nil {
log.Errorf("bigtable-idx: failed to create bigtable client. %s", err)
log.Errorf("bigtable-idx: failed to create bigtable client: %s", err)
return err
}

Expand Down Expand Up @@ -199,7 +199,7 @@ func (b *BigtableIdx) Stop() {

err := b.client.Close()
if err != nil {
log.Errorf("bigtable-idx: Error closing bigtable client. %s", err)
log.Errorf("bigtable-idx: Error closing bigtable client: %s", err)
}
}

Expand All @@ -223,7 +223,7 @@ func (b *BigtableIdx) Update(point schema.MetricPoint, partition int32) (idx.Arc
go func() {
err := b.deleteRow(FormatRowKey(archive.Id, oldPartition))
if err != nil {
log.Errorf("bigtable-idx: failed to delete row. %s", err)
log.Errorf("bigtable-idx: Failed to delete row %s: %s", archive.Id, err)
}
}()
}
Expand Down Expand Up @@ -261,7 +261,7 @@ func (b *BigtableIdx) AddOrUpdate(mkey schema.MKey, data *schema.MetricData, par
go func() {
err := b.deleteRow(FormatRowKey(archive.Id, oldPartition))
if err != nil {
log.Errorf("bigtable-idx: failed to delete row. %s", err)
log.Errorf("bigtable-idx: Failed to delete row %s: %s", archive.Id, err)
}
}()
}
Expand Down Expand Up @@ -390,7 +390,7 @@ func (b *BigtableIdx) processWriteQueue() {
errs, err := b.tbl.ApplyBulk(context.Background(), rowKeys, mutations)
if err != nil {
statQueryInsertFail.Add(len(rowKeys))
log.Errorf("bigtable-idx: Failed to write %d defs to bigtable. they won't be retried. %s", len(rowKeys), err)
log.Errorf("bigtable-idx: Failed to write %d defs to bigtable. they won't be retried: %s", len(rowKeys), err)
complete = true
} else if len(errs) > 0 {
var failedRowKeys []string
Expand Down Expand Up @@ -465,6 +465,7 @@ func (b *BigtableIdx) Delete(orgId uint32, pattern string) ([]idx.Archive, error
delErr := b.deleteDef(&def.MetricDefinition)
// the last error encountered will be passed back to the caller
if delErr != nil {
log.Errorf("bigtable-idx: Failed to delete def %s: %s", def.MetricDefinition.Id, err)
err = delErr
}
}
Expand All @@ -484,7 +485,6 @@ func (b *BigtableIdx) deleteRow(key string) error {
err := b.tbl.Apply(context.Background(), key, mut)
if err != nil {
statQueryDeleteFail.Inc()
log.Errorf("bigtable-idx: Failed to delete row %s from bigtable. %s", key, err)
return err
}

Expand Down
10 changes: 5 additions & 5 deletions idx/cassandra/cassandra.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ func (c *CasIdx) processWriteQueue() {
qry := `INSERT INTO metric_idx (id, orgid, partition, name, interval, unit, mtype, tags, lastupdate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`
for req = range c.writeQueue {
if err != nil {
log.Errorf("Failed to marshal metricDef. %s", err)
log.Errorf("Failed to marshal metricDef: %s. value was: %+v", err, *req.def)
continue
}
statQueryInsertWaitDuration.Value(time.Since(req.recvTime))
Expand All @@ -466,7 +466,7 @@ func (c *CasIdx) processWriteQueue() {
statQueryInsertFail.Inc()
errmetrics.Inc(err)
if (attempts % 20) == 0 {
log.Warnf("cassandra-idx: Failed to write def to cassandra. it will be retried. %s", err)
log.Warnf("cassandra-idx: Failed to write def to cassandra. it will be retried. %s. the value was: %+v", err, *req.def)
}
sleepTime := 100 * attempts
if sleepTime > 2000 {
Expand All @@ -478,7 +478,7 @@ func (c *CasIdx) processWriteQueue() {
success = true
statQueryInsertExecDuration.Value(time.Since(pre))
statQueryInsertOk.Inc()
log.Debugf("cassandra-idx: metricDef saved to cassandra. %s", req.def.Id)
log.Debugf("cassandra-idx: metricDef %s saved to cassandra", req.def.Id)
}
}
}
Expand Down Expand Up @@ -514,7 +514,7 @@ func (c *CasIdx) deleteDef(key schema.MKey, part int32) error {
if err != nil {
statQueryDeleteFail.Inc()
errmetrics.Inc(err)
log.Errorf("cassandra-idx: Failed to delete metricDef %s from cassandra. %s", keyStr, err)
log.Warnf("cassandra-idx: Failed to delete metricDef %s from cassandra: %s", keyStr, err)
time.Sleep(time.Second)
} else {
statQueryDeleteOk.Inc()
Expand All @@ -528,7 +528,7 @@ func (c *CasIdx) deleteDef(key schema.MKey, part int32) error {
func (c *CasIdx) deleteDefAsync(key schema.MKey, part int32) {
go func() {
if err := c.deleteDef(key, part); err != nil {
log.Errorf(err.Error())
log.Errorf("cassandra-idx: %s", err.Error())
}
}()
}
Expand Down