fixes

Author: kprokopenko

internal/table/client.go

@@ -286,7 +286,7 @@ func (c *Client) BulkUpsert(
 	tableName string,
 	data table.BulkUpsertData,
 	opts ...table.Option,
-) error {
+) (finalErr error) {
 	if c == nil {
 		return xerrors.WithStackTrace(errNilClient)
 	}
@@ -295,34 +295,13 @@ func (c *Client) BulkUpsert(
 		return xerrors.WithStackTrace(errClosedClient)
 	}
 
-	request, err := data.ToYDB(tableName)
-	if err != nil {
-		return xerrors.WithStackTrace(err)
-	}
-
-	chunks := make([]*Ydb_Table.BulkUpsertRequest, 0, 1)
-
-	// We must send requests in chunks to avoid exceeding the maximum message size
-	chunks, err = chunkBulkUpsertRequest(chunks, request, c.config.MaxRequestMessageSize())
-	if err != nil {
-		return err
-	}
-
-	return c.sendBulkUpsertRequest(ctx, chunks, opts...)
-}
-
-func (c *Client) sendBulkUpsertRequest(
-	ctx context.Context,
-	requests []*Ydb_Table.BulkUpsertRequest,
-	opts ...table.Option,
-) (finalErr error) {
 	attempts, config := 0, c.retryOptions(opts...)
 	config.RetryOptions = append(config.RetryOptions,
 		retry.WithIdempotent(true),
 		retry.WithTrace(&trace.Retry{
 			OnRetry: func(info trace.RetryLoopStartInfo) func(trace.RetryLoopDoneInfo) {
 				return func(info trace.RetryLoopDoneInfo) {
-					attempts += info.Attempts - 1
+					attempts += max(info.Attempts-1, 0) // `max` guarded against negative values
 				}
 			},
 		}),
@@ -335,6 +314,27 @@ func (c *Client) sendBulkUpsertRequest(
 		onDone(finalErr, attempts+1)
 	}()
 
+	request, err := data.ToYDB(tableName)
+	if err != nil {
+		return xerrors.WithStackTrace(err)
+	}
+
+	chunks := make([]*Ydb_Table.BulkUpsertRequest, 0, 1)
+
+	// We must send requests in chunks to avoid exceeding the maximum message size
+	chunks, err = chunkBulkUpsertRequest(chunks, request, c.config.MaxRequestMessageSize())
+	if err != nil {
+		return err
+	}
+
+	return c.sendBulkUpsertRequest(ctx, chunks, config.RetryOptions...)
+}
+
+func (c *Client) sendBulkUpsertRequest(
+	ctx context.Context,
+	requests []*Ydb_Table.BulkUpsertRequest,
+	retryOpts ...retry.Option,
+) error {
 	client := Ydb_Table_V1.NewTableServiceClient(c.cc)
 
 	for _, request := range requests {
@@ -344,7 +344,7 @@ func (c *Client) sendBulkUpsertRequest(
 
 				return err
 			},
-			config.RetryOptions...,
+			retryOpts...,
 		)
 		if err != nil {
 			return xerrors.WithStackTrace(err)