Skip to content

Commit 39d4103

Browse files
committed
Logging and fix
Signed-off-by: Matt Hess <[email protected]>
1 parent 5310bc4 commit 39d4103

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

hedera-node/hedera-app/src/main/java/com/hedera/node/app/Hedera.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -718,6 +718,7 @@ private void migrateSchemas(
718718
@Nullable final Network genesisNetwork,
719719
@NonNull final Configuration platformConfig) {
720720
final var previousVersion = deserializedVersion == null ? null : deserializedVersion.getPbjSemanticVersion();
721+
logger.info("Migrating schemas with deserialized version {}, determined previous version {}", deserializedVersion, previousVersion);
721722
final var isUpgrade = version.compareTo(deserializedVersion) > 0;
722723
logger.info(
723724
"{} from Services version {} @ current {} with trigger {}",

hedera-node/hedera-app/src/main/java/com/hedera/node/app/services/OrderedServiceMigrator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public List<StateChanges.Builder> doMigrations(
8383

8484
final Map<String, Object> sharedValues = new HashMap<>();
8585
final var migrationStateChanges = new MigrationStateChanges(state, appConfig, storeMetricsService);
86-
logger.info("Migrating Entity ID Service as pre-requisite for other services");
86+
logger.info("Migrating Entity ID Service as pre-requisite for other services (previousVersion={}, currentVersion={})", previousVersion, currentVersion);
8787
final var entityIdRegistration = servicesRegistry.registrations().stream()
8888
.filter(service -> EntityIdService.NAME.equals(service.service().getServiceName()))
8989
.findFirst()
@@ -92,6 +92,7 @@ public List<StateChanges.Builder> doMigrations(
9292
final var deserializedPbjVersion = Optional.ofNullable(previousVersion)
9393
.map(SoftwareVersion::getPbjSemanticVersion)
9494
.orElse(null);
95+
logger.info("OSM: deserializedPbjVersion: {}", deserializedPbjVersion);
9596
entityIdRegistry.migrate(
9697
state,
9798
deserializedPbjVersion,

platform-sdk/swirlds-state-api/src/main/java/com/swirlds/state/lifecycle/MigrationContext.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,23 @@
66
import com.swirlds.state.lifecycle.info.NetworkInfo;
77
import com.swirlds.state.spi.ReadableStates;
88
import com.swirlds.state.spi.WritableStates;
9+
10+
import org.apache.logging.log4j.LogManager;
11+
import org.apache.logging.log4j.Logger;
12+
913
import edu.umd.cs.findbugs.annotations.NonNull;
1014
import edu.umd.cs.findbugs.annotations.Nullable;
1115
import java.util.Map;
16+
import java.util.Objects;
1217
import java.util.function.Function;
1318

1419
/**
1520
* Provides the context for a migration of state from one {@link Schema} version to another.
1621
*/
1722
public interface MigrationContext {
18-
/**
23+
Logger log = LogManager.getLogger(MigrationContext.class);
24+
25+
/**
1926
* Returns the round number of the state being migrated, zero at genesis.
2027
*/
2128
long roundNumber();
@@ -113,7 +120,10 @@ public interface MigrationContext {
113120
* Returns whether this is a genesis migration.
114121
*/
115122
default boolean isGenesis() {
116-
return previousVersion() == null || previousVersion() == SemanticVersion.DEFAULT;
123+
log.info("MigCtx: Previous version: {}", previousVersion());
124+
log.info("MigCtx: prevVers == SemanticVers.DEFAULT: {}", previousVersion() == SemanticVersion.DEFAULT);
125+
log.info("MigCtx: prevVers.equals(DEFAULT): {}", Objects.equals(previousVersion(), SemanticVersion.DEFAULT));
126+
return previousVersion() == null || Objects.equals(previousVersion(), SemanticVersion.DEFAULT);
117127
}
118128

119129
/**

0 commit comments

Comments
 (0)