coderzc commented on code in PR #18293:
URL: https://github.com/apache/pulsar/pull/18293#discussion_r1015299351
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/BookkeeperSchemaStorage.java:
##########
@@ -284,56 +282,12 @@ private CompletableFuture<Long> putSchema(String
schemaId, byte[] data, byte[] h
return
readSchemaEntry(locator.getIndexList().get(0).getPosition())
.thenCompose(schemaEntry ->
addNewSchemaEntryToStore(schemaId,
locator.getIndexList(), data).thenCompose(
- position -> {
- CompletableFuture<Long> future = new
CompletableFuture<>();
- updateSchemaLocator(schemaId,
optLocatorEntry.get(), position, hash)
- .thenAccept(future::complete)
- .exceptionally(ex -> {
- if (ex.getCause() instanceof
BadVersionException) {
- // There was a race
condition on the schema creation.
- // Since it has now been
created,
- // retry the whole
operation so that we have a chance to
- // recover without
bubbling error
- putSchema(schemaId, data,
hash)
-
.thenAccept(future::complete)
- .exceptionally(ex2
-> {
-
future.completeExceptionally(ex2);
- return null;
- });
- } else {
- // For other errors, just fail the
operation
- future.completeExceptionally(ex);
- }
- return null;
- });
- return future;
- })
+ position -> updateSchemaLocator(schemaId,
optLocatorEntry.get(), position, hash))
);
} else {
// No schema was defined yet
CompletableFuture<Long> future = new CompletableFuture<>();
Review Comment:
Remove useless `future`.
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/SchemaRegistryServiceImpl.java:
##########
@@ -180,57 +182,85 @@ public
CompletableFuture<List<CompletableFuture<SchemaAndMetadata>>> getAllSchem
@Override
@NotNull
public CompletableFuture<SchemaVersion> putSchemaIfAbsent(String schemaId,
SchemaData schema,
-
SchemaCompatibilityStrategy strategy) {
+ SchemaCompatibilityStrategy strategy) {
+
+ return putSchemaIfAbsent(schemaId, schema, strategy, 0, 0);
+ }
+ @Override
+ @NotNull
+ public CompletableFuture<SchemaVersion> putSchemaIfAbsent(String schemaId,
SchemaData schema,
+ SchemaCompatibilityStrategy strategy, long startTime, int retry) {
return
trimDeletedSchemaAndGetList(schemaId).thenCompose(schemaAndMetadataList ->
getSchemaVersionBySchemaData(schemaAndMetadataList,
schema).thenCompose(schemaVersion -> {
- if (schemaVersion != null) {
- if (log.isDebugEnabled()) {
- log.debug("[{}] Schema is already exists", schemaId);
- }
- return CompletableFuture.completedFuture(schemaVersion);
- }
- CompletableFuture<Void> checkCompatibilityFuture = new
CompletableFuture<>();
- if (schemaAndMetadataList.size() != 0) {
- if (isTransitiveStrategy(strategy)) {
- checkCompatibilityFuture =
- checkCompatibilityWithAll(schemaId, schema,
strategy, schemaAndMetadataList);
- } else {
- checkCompatibilityFuture =
checkCompatibilityWithLatest(schemaId, schema, strategy);
- }
- } else {
- checkCompatibilityFuture.complete(null);
- }
- return checkCompatibilityFuture.thenCompose(v -> {
- byte[] context =
hashFunction.hashBytes(schema.getData()).asBytes();
- SchemaRegistryFormat.SchemaInfo info =
SchemaRegistryFormat.SchemaInfo.newBuilder()
-
.setType(Functions.convertFromDomainType(schema.getType()))
- .setSchema(ByteString.copyFrom(schema.getData()))
- .setSchemaId(schemaId)
- .setUser(schema.getUser())
- .setDeleted(false)
- .setTimestamp(clock.millis())
- .addAllProps(toPairs(schema.getProps()))
- .build();
-
- long start = this.clock.millis();
-
- return schemaStorage
- .put(schemaId, info.toByteArray(), context)
- .whenComplete((__, t) -> {
- if (t != null) {
- log.error("[{}] Put schema failed", schemaId);
- this.stats.recordPutFailed(schemaId);
- } else {
- if (log.isDebugEnabled()) {
- log.debug("[{}] Put schema finished",
schemaId);
- }
- this.stats.recordPutLatency(schemaId,
this.clock.millis() - start);
- }
- });
-
- });
-
- }));
+ if (schemaVersion != null) {
+ if (log.isDebugEnabled()) {
+ log.debug("[{}] Schema is already exists",
schemaId);
+ }
+ return
CompletableFuture.completedFuture(schemaVersion);
+ }
+ CompletableFuture<Void> checkCompatibilityFuture = new
CompletableFuture<>();
+ if (schemaAndMetadataList.size() != 0) {
+ if (isTransitiveStrategy(strategy)) {
+ checkCompatibilityFuture =
checkCompatibilityWithAll(schemaId, schema,
+ strategy, schemaAndMetadataList);
+ } else {
+ checkCompatibilityFuture =
checkCompatibilityWithLatest(schemaId,
+ schema, strategy);
+ }
+ } else {
+ checkCompatibilityFuture.complete(null);
+ }
+ return checkCompatibilityFuture.thenCompose(v -> {
+ byte[] context =
hashFunction.hashBytes(schema.getData()).asBytes();
+ SchemaRegistryFormat.SchemaInfo info =
SchemaRegistryFormat.SchemaInfo
+ .newBuilder()
+
.setType(Functions.convertFromDomainType(schema.getType()))
+
.setSchema(ByteString.copyFrom(schema.getData()))
+ .setSchemaId(schemaId)
+ .setUser(schema.getUser())
+ .setDeleted(false)
+ .setTimestamp(clock.millis())
+ .addAllProps(toPairs(schema.getProps()))
+ .build();
+ long start = startTime > 0 ? startTime :
this.clock.millis();
+ CompletableFuture<SchemaVersion> persistentFuture =
new CompletableFuture<>();
+ schemaStorage
+ .put(schemaId, info.toByteArray(), context)
+ .thenAccept(sv -> {
+ if (log.isDebugEnabled()) {
+ log.debug("[{}] Schema is successfully
added", schemaId);
+ }
+ this.stats.recordPutLatency(schemaId,
this.clock.millis() - start);
+ persistentFuture.complete(sv);
+ })
+ .exceptionally(t -> {
+ if (t.getCause() instanceof
AlreadyExistsException
+ || t.getCause() instanceof
BadVersionException) {
+ // retry if put schemaLocator to zk
failed caused by race condition
+ int retryTime = retry > 0 ? retry : 1;
Review Comment:
`retryTime` always seems to be `1`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
