This is an automated email from the ASF dual-hosted git repository. kturner pushed a commit to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/elasticity by this push: new eedbedf133 sets tablet hosting goals at initialization (#3325) eedbedf133 is described below commit eedbedf133beaf9847cd0fd8c53b313b089d6e5b Author: Keith Turner <ktur...@apache.org> AuthorDate: Thu Apr 20 13:55:44 2023 -0400 sets tablet hosting goals at initialization (#3325) --- .../java/org/apache/accumulo/server/init/FileSystemInitializer.java | 4 ++++ .../java/org/apache/accumulo/server/init/ZooKeeperInitializer.java | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/server/base/src/main/java/org/apache/accumulo/server/init/FileSystemInitializer.java b/server/base/src/main/java/org/apache/accumulo/server/init/FileSystemInitializer.java index daed8281b8..952ac689ca 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/init/FileSystemInitializer.java +++ b/server/base/src/main/java/org/apache/accumulo/server/init/FileSystemInitializer.java @@ -18,6 +18,7 @@ */ package org.apache.accumulo.server.init; +import static org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.HostingColumnFamily.GOAL_COLUMN; import static org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN; import static org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ServerColumnFamily.TIME_COLUMN; import static org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN; @@ -29,7 +30,9 @@ import java.util.Map; import java.util.TreeMap; import org.apache.accumulo.core.Constants; +import org.apache.accumulo.core.client.admin.TabletHostingGoal; import org.apache.accumulo.core.client.admin.TimeType; +import org.apache.accumulo.core.clientImpl.TabletHostingGoalUtil; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.SiteConfiguration; import org.apache.accumulo.core.crypto.CryptoFactoryLoader; @@ -186,6 +189,7 @@ class FileSystemInitializer { addEntry(map, extent, TIME_COLUMN, new Value(new MetadataTime(0, TimeType.LOGICAL).encode())); addEntry(map, extent, PREV_ROW_COLUMN, MetadataSchema.TabletsSection.TabletColumnFamily.encodePrevEndRow(tablet.prevEndRow)); + addEntry(map, extent, GOAL_COLUMN, TabletHostingGoalUtil.toValue(TabletHostingGoal.ALWAYS)); for (String file : tablet.files) { addEntry(map, extent, new ColumnFQ(MetadataSchema.TabletsSection.DataFileColumnFamily.NAME, new Text(file)), diff --git a/server/base/src/main/java/org/apache/accumulo/server/init/ZooKeeperInitializer.java b/server/base/src/main/java/org/apache/accumulo/server/init/ZooKeeperInitializer.java index a939d237c1..55a77cdfdc 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/init/ZooKeeperInitializer.java +++ b/server/base/src/main/java/org/apache/accumulo/server/init/ZooKeeperInitializer.java @@ -23,8 +23,10 @@ import static java.nio.charset.StandardCharsets.UTF_8; import java.io.IOException; import org.apache.accumulo.core.Constants; +import org.apache.accumulo.core.client.admin.TabletHostingGoal; import org.apache.accumulo.core.client.admin.TimeType; import org.apache.accumulo.core.clientImpl.Namespace; +import org.apache.accumulo.core.clientImpl.TabletHostingGoalUtil; import org.apache.accumulo.core.data.InstanceId; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; @@ -180,6 +182,9 @@ public class ZooKeeperInitializer { MetadataSchema.TabletsSection.ServerColumnFamily.TIME_COLUMN.put(mutation, new Value(new MetadataTime(0, TimeType.LOGICAL).encode())); + MetadataSchema.TabletsSection.HostingColumnFamily.GOAL_COLUMN.put(mutation, + TabletHostingGoalUtil.toValue(TabletHostingGoal.ALWAYS)); + RootTabletMetadata rootTabletJson = new RootTabletMetadata(); rootTabletJson.update(mutation);