Skip to content

Commit 7e039eb

Browse files
Shivs11Shivs11
authored
Merge branch 'main' into trampolining-pt2
2 parents f515d68 + 1c288e6 commit 7e039eb

File tree

8 files changed

+22
-24
lines changed

8 files changed

+22
-24
lines changed

‎common/persistence/cassandra/history_store.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ func (h *HistoryStore) ReadHistoryBranch(
182182
}
183183

184184
if err := iter.Close(); err != nil {
185-
return nil, serviceerror.NewUnavailablef("ReadHistoryBranch. Close operation failed. Error: %v", err)
185+
return nil, gocql.ConvertError("ReadHistoryBranch", err)
186186
}
187187

188188
return &p.InternalReadHistoryBranchResponse{
@@ -334,7 +334,7 @@ func (h *HistoryStore) GetAllHistoryTreeBranches(
334334
}
335335

336336
if err := iter.Close(); err != nil {
337-
return nil, serviceerror.NewUnavailablef("GetAllHistoryTreeBranches. Close operation failed. Error: %v", err)
337+
return nil, gocql.ConvertError("GetAllHistoryTreeBranches", err)
338338
}
339339

340340
response := &p.InternalGetAllHistoryTreeBranchesResponse{

‎common/persistence/cassandra/matching_task_store_user_data.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55
"fmt"
66

7-
"go.temporal.io/api/serviceerror"
87
p "go.temporal.io/server/common/persistence"
98
"go.temporal.io/server/common/persistence/nosql/nosqlplugin/cassandra/gocql"
109
)
@@ -167,7 +166,7 @@ func (d *userDataStore) ListTaskQueueUserDataEntries(ctx context.Context, reques
167166
}
168167

169168
if err := iter.Close(); err != nil {
170-
return nil, serviceerror.NewUnavailablef("ListTaskQueueUserDataEntries operation failed. Error: %v", err)
169+
return nil, gocql.ConvertError("ListTaskQueueUserDataEntries", err)
171170
}
172171
return response, nil
173172
}
@@ -201,7 +200,7 @@ func (d *userDataStore) GetTaskQueuesByBuildId(ctx context.Context, request *p.G
201200
}
202201

203202
if err := iter.Close(); err != nil {
204-
return nil, serviceerror.NewUnavailablef("GetTaskQueuesByBuildId operation failed. Error: %v", err)
203+
return nil, gocql.ConvertError("GetTaskQueuesByBuildId", err)
205204
}
206205
return taskQueues, nil
207206
}

‎common/persistence/cassandra/matching_task_store_v1.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ func (d *matchingTaskStoreV1) GetTasks(
175175
}
176176

177177
if err := iter.Close(); err != nil {
178-
return nil, serviceerror.NewUnavailablef("GetTasks operation failed. Error: %v", err)
178+
return nil, gocql.ConvertError("GetTasks", err)
179179
}
180180
return response, nil
181181
}

‎common/persistence/cassandra/matching_task_store_v2.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ func (d *matchingTaskStoreV2) GetTasks(
186186
}
187187

188188
if err := iter.Close(); err != nil {
189-
return nil, serviceerror.NewUnavailablef("GetTasks operation failed. Error: %v", err)
189+
return nil, gocql.ConvertError("GetTasks", err)
190190
}
191191
return response, nil
192192
}

‎common/persistence/cassandra/metadata_store.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func (m *MetadataStore) CreateNamespace(
105105
existingRow := make(map[string]any)
106106
applied, err := query.MapScanCAS(existingRow)
107107
if err != nil {
108-
return nil, serviceerror.NewUnavailablef("CreateNamespace operation failed. Inserting into namespaces table. Error: %v", err)
108+
return nil, gocql.ConvertError("CreateNamespace", err)
109109
}
110110

111111
if !applied {
@@ -149,7 +149,7 @@ func (m *MetadataStore) CreateNamespaceInV2Table(
149149
previous := make(map[string]any)
150150
applied, iter, err := m.session.MapExecuteBatchCAS(batch, previous)
151151
if err != nil {
152-
return nil, serviceerror.NewUnavailablef("CreateNamespace operation failed. Inserting into namespaces table. Error: %v", err)
152+
return nil, gocql.ConvertError("CreateNamespace", err)
153153
}
154154
defer func() { _ = iter.Close() }()
155155
deleteOrphanNamespace := func() {
@@ -221,7 +221,7 @@ func (m *MetadataStore) UpdateNamespace(
221221
previous := make(map[string]any)
222222
applied, iter, err := m.session.MapExecuteBatchCAS(batch, previous)
223223
if err != nil {
224-
return serviceerror.NewUnavailablef("UpdateNamespace operation failed. Error: %v", err)
224+
return gocql.ConvertError("UpdateNamespace", err)
225225
}
226226
defer func() { _ = iter.Close() }()
227227

@@ -252,7 +252,7 @@ func (m *MetadataStore) RenameNamespace(
252252
request.Name,
253253
request.Id,
254254
).WithContext(ctx).Exec(); updateErr != nil {
255-
return serviceerror.NewUnavailablef("RenameNamespace operation failed to update 'namespaces_by_id' table. Error: %v", updateErr)
255+
return gocql.ConvertError("RenameNamespace", updateErr)
256256
}
257257

258258
// Step 2.
@@ -275,7 +275,7 @@ func (m *MetadataStore) RenameNamespace(
275275
previous := make(map[string]any)
276276
applied, iter, err := m.session.MapExecuteBatchCAS(batch, previous)
277277
if err != nil {
278-
return serviceerror.NewUnavailablef("RenameNamespace operation failed. Error: %v", err)
278+
return gocql.ConvertError("RenameNamespace", err)
279279
}
280280
defer func() { _ = iter.Close() }()
281281

@@ -311,7 +311,7 @@ func (m *MetadataStore) GetNamespace(
311311
}
312312
return serviceerror.NewNamespaceNotFound(identity)
313313
}
314-
return serviceerror.NewUnavailablef("GetNamespace operation failed. Error %v", err)
314+
return gocql.ConvertError("GetNamespace", err)
315315
}
316316

317317
namespace := request.Name
@@ -396,7 +396,7 @@ func (m *MetadataStore) ListNamespaces(
396396
nextPageToken = nil
397397
}
398398
if err := iter.Close(); err != nil {
399-
return nil, serviceerror.NewUnavailablef("ListNamespaces operation failed. Error: %v", err)
399+
return nil, gocql.ConvertError("ListNamespaces", err)
400400
}
401401

402402
if len(nextPageToken) == 0 {
@@ -488,12 +488,12 @@ func (m *MetadataStore) updateMetadataBatch(
488488
func (m *MetadataStore) deleteNamespace(ctx context.Context, name string, ID []byte) error {
489489
query := m.session.Query(templateDeleteNamespaceByNameQueryV2, constNamespacePartition, name).WithContext(ctx)
490490
if err := query.Exec(); err != nil {
491-
return serviceerror.NewUnavailablef("DeleteNamespaceByName operation failed. Error %v", err)
491+
return gocql.ConvertError("DeleteNamespaceByName", err)
492492
}
493493

494494
query = m.session.Query(templateDeleteNamespaceQuery, ID).WithContext(ctx)
495495
if err := query.Exec(); err != nil {
496-
return serviceerror.NewUnavailablef("DeleteNamespace operation failed. Error %v", err)
496+
return gocql.ConvertError("DeleteNamespace", err)
497497
}
498498

499499
return nil

‎common/persistence/cassandra/mutable_state_task_store.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ func (d *MutableStateTaskStore) AddHistoryTasks(
217217
Msg: fmt.Sprintf("Failed to add tasks. Request RangeID: %v, Actual RangeID: %v", request.RangeID, previousRangeID),
218218
}
219219
} else {
220-
return serviceerror.NewUnavailable("AddTasks operation failed: %v")
220+
return serviceerror.NewUnavailable("AddTasks operation failed because of conditional failure.")
221221
}
222222
}
223223
return nil

‎common/persistence/cassandra/nexus_endpoint_store.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ func (s *NexusEndpointStore) ListNexusEndpoints(
195195
}
196196

197197
if err := iter.Close(); err != nil {
198-
return nil, serviceerror.NewUnavailablef("ListNexusEndpoints operation failed: %v", err)
198+
return nil, gocql.ConvertError("ListNexusEndpoints", err)
199199
}
200200

201201
currentTableVersion, err := s.getTableVersion(ctx)

‎common/persistence/cassandra/queue_store.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66

77
commonpb "go.temporal.io/api/common/v1"
88
enumspb "go.temporal.io/api/enums/v1"
9-
"go.temporal.io/api/serviceerror"
109
persistencespb "go.temporal.io/server/api/persistence/v1"
1110
"go.temporal.io/server/common/log"
1211
"go.temporal.io/server/common/persistence"
@@ -147,7 +146,7 @@ func (q *QueueStore) ReadMessages(
147146
}
148147

149148
if err := iter.Close(); err != nil {
150-
return nil, serviceerror.NewUnavailablef("ReadMessages operation failed. Error: %v", err)
149+
return nil, gocql.ConvertError("ReadMessages", err)
151150
}
152151

153152
return result, nil
@@ -182,7 +181,7 @@ func (q *QueueStore) ReadMessagesFromDLQ(
182181
nextPageToken = iter.PageState()
183182
}
184183
if err := iter.Close(); err != nil {
185-
return nil, nil, serviceerror.NewUnavailablef("ReadMessagesFromDLQ operation failed. Error: %v", err)
184+
return nil, nil, gocql.ConvertError("ReadMessagesFromDLQ", err)
186185
}
187186

188187
return result, nextPageToken, nil
@@ -195,7 +194,7 @@ func (q *QueueStore) DeleteMessagesBefore(
195194

196195
query := q.session.Query(templateDeleteMessagesBeforeQuery, q.queueType, messageID).WithContext(ctx)
197196
if err := query.Exec(); err != nil {
198-
return serviceerror.NewUnavailablef("DeleteMessagesBefore operation failed. Error %v", err)
197+
return gocql.ConvertError("DeleteMessagesBefore", err)
199198
}
200199
return nil
201200
}
@@ -208,7 +207,7 @@ func (q *QueueStore) DeleteMessageFromDLQ(
208207
// Use negative queue type as the dlq type
209208
query := q.session.Query(templateDeleteMessageQuery, q.getDLQTypeFromQueueType(), messageID).WithContext(ctx)
210209
if err := query.Exec(); err != nil {
211-
return serviceerror.NewUnavailablef("DeleteMessageFromDLQ operation failed. Error %v", err)
210+
return gocql.ConvertError("DeleteMessageFromDLQ", err)
212211
}
213212

214213
return nil
@@ -223,7 +222,7 @@ func (q *QueueStore) RangeDeleteMessagesFromDLQ(
223222
// Use negative queue type as the dlq type
224223
query := q.session.Query(templateDeleteMessagesQuery, q.getDLQTypeFromQueueType(), firstMessageID, lastMessageID).WithContext(ctx)
225224
if err := query.Exec(); err != nil {
226-
return serviceerror.NewUnavailablef("RangeDeleteMessagesFromDLQ operation failed. Error %v", err)
225+
return gocql.ConvertError("RangeDeleteMessagesFromDLQ", err)
227226
}
228227

229228
return nil

0 commit comments

Comments
 (0)