Skip to content

Fix bug that failed to get enough normal replica because path hash is not set. #1714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morningman merged 2 commits into from
Aug 28, 2019
Merged

Fix bug that failed to get enough normal replica because path hash is not set. #1714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78b4b3c
Fix bug that failed to get enough normal replica because path hash is…
morningman Aug 28, 2019
6788ad9
fix bug
morningman Aug 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions be/src/olap/tablet_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,7 +953,7 @@ OLAPStatus TabletManager::report_tablet_info(TTabletInfo* tablet_info) {
}

_build_tablet_info(tablet, tablet_info);
LOG(INFO) << "success to process report tablet info.";
VLOG(10) << "success to process report tablet info.";
return res;
} // report_tablet_info

Expand Down Expand Up @@ -987,13 +987,6 @@ OLAPStatus TabletManager::report_all_tablets_info(std::map<TTabletId, TTablet>*
tablet_ptr->schema_hash(), tablet_ptr->tablet_uid(), &transaction_ids);
tablet_info.__set_transaction_ids(transaction_ids);

if (_available_storage_medium_type_count > 1) {
tablet_info.__set_storage_medium(tablet_ptr->data_dir()->storage_medium());
}

tablet_info.__set_version_count(tablet_ptr->version_count());
tablet_info.__set_path_hash(tablet_ptr->data_dir()->path_hash());

tablet.tablet_infos.push_back(tablet_info);
}

Expand Down Expand Up @@ -1175,6 +1168,11 @@ void TabletManager::_build_tablet_info(TabletSharedPtr tablet, TTabletInfo* tabl
tablet_info->version = version.second;
tablet_info->version_hash = v_hash;
tablet_info->__set_partition_id(tablet->partition_id());
if (_available_storage_medium_type_count > 1) {
tablet_info->__set_storage_medium(tablet->data_dir()->storage_medium());
}
tablet_info->__set_version_count(tablet->version_count());
tablet_info->__set_path_hash(tablet->data_dir()->path_hash());
}

void TabletManager::_build_tablet_stat() {
Expand Down
4 changes: 4 additions & 0 deletions fe/src/main/java/org/apache/doris/alter/RollupJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,10 @@ public synchronized void handleFinishedReplica(AgentTask task, TTabletInfo finis
// the version is not set now
rollupReplica.updateVersionInfo(version, versionHash, dataSize, rowCount);

if (finishTabletInfo.isSetPath_hash()) {
rollupReplica.setPathHash(finishTabletInfo.getPath_hash());
}

setReplicaFinished(partitionId, rollupReplicaId);
rollupReplica.setState(ReplicaState.NORMAL);

Expand Down
3 changes: 3 additions & 0 deletions fe/src/main/java/org/apache/doris/alter/SchemaChangeJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,9 @@ public void handleFinishedReplica(AgentTask task, TTabletInfo finishTabletInfo,
long rowCount = finishTabletInfo.getRow_count();
// do not need check version > replica.getVersion, because the new replica's version is first set by sc
replica.updateVersionInfo(version, versionHash, dataSize, rowCount);
if (finishTabletInfo.isSetPath_hash()) {
replica.setPathHash(finishTabletInfo.getPath_hash());
}
} finally {
db.writeUnlock();
}
Expand Down
8 changes: 5 additions & 3 deletions fe/src/main/java/org/apache/doris/backup/RestoreJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,10 @@
import com.google.common.base.Preconditions;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import com.google.common.collect.Range;
import com.google.common.collect.Table.Cell;

Expand Down Expand Up @@ -755,7 +757,7 @@ private void checkAndPrepareMeta() {
unfinishedSignatureToId.clear();
taskProgress.clear();
taskErrMsg.clear();
Map<Long, Long> pathBeMap = Maps.newHashMap();
Multimap<Long, Long> bePathsMap = HashMultimap.create();
batchTask = new AgentBatchTask();
db.readLock();
try {
Expand All @@ -774,14 +776,14 @@ private void checkAndPrepareMeta() {
true /* is restore task*/);
batchTask.addTask(task);
unfinishedSignatureToId.put(signature, tablet.getId());
pathBeMap.put(replica.getPathHash(), replica.getBackendId());
bePathsMap.put(replica.getBackendId(), replica.getPathHash());
}
} finally {
db.readUnlock();
}

// check disk capacity
org.apache.doris.common.Status st = Catalog.getCurrentSystemInfo().checkExceedDiskCapacityLimit(pathBeMap, true);
org.apache.doris.common.Status st = Catalog.getCurrentSystemInfo().checkExceedDiskCapacityLimit(bePathsMap, true);
if (!st.ok()) {
status = new Status(ErrCode.COMMON_ERROR, st.getErrorMsg());
return;
Expand Down
12 changes: 6 additions & 6 deletions fe/src/main/java/org/apache/doris/catalog/Tablet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@
import org.apache.doris.system.Backend;
import org.apache.doris.system.SystemInfoService;

import com.google.common.collect.HashMultimap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;

import org.apache.logging.log4j.LogManager;
Expand All @@ -40,7 +41,6 @@
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;

/**
Expand Down Expand Up @@ -186,9 +186,9 @@ public List<Long> getNormalReplicaBackendIds() {
return beIds;
}

// return map of (path hash -> BE id) of normal replicas
public Map<Long, Long> getNormalReplicaBackendPathMap() {
Map<Long, Long> map = Maps.newHashMap();
// return map of (BE id -> path hash) of normal replicas
public Multimap<Long, Long> getNormalReplicaBackendPathMap() {
Multimap<Long, Long> map = HashMultimap.create();
SystemInfoService infoService = Catalog.getCurrentSystemInfo();
for (Replica replica : replicas) {
if (replica.isBad()) {
Expand All @@ -198,7 +198,7 @@ public Map<Long, Long> getNormalReplicaBackendPathMap() {
ReplicaState state = replica.getState();
if (infoService.checkBackendAlive(replica.getBackendId())
&& (state == ReplicaState.NORMAL || state == ReplicaState.SCHEMA_CHANGE)) {
map.put(replica.getPathHash(), replica.getBackendId());
map.put(replica.getBackendId(), replica.getPathHash());
}
}
return map;
Expand Down
3 changes: 3 additions & 0 deletions fe/src/main/java/org/apache/doris/clone/TabletSchedCtx.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,6 +876,9 @@ public void finishCloneTask(CloneTask cloneTask, TFinishTaskRequest request)

replica.updateVersionInfo(reportedTablet.getVersion(), reportedTablet.getVersion_hash(),
reportedTablet.getData_size(), reportedTablet.getRow_count());
if (reportedTablet.isSetPath_hash()) {
replica.setPathHash(reportedTablet.getPath_hash());
}

if (this.type == Type.BALANCE) {
long partitionVisibleVersion = partition.getVisibleVersion();
Expand Down
18 changes: 10 additions & 8 deletions fe/src/main/java/org/apache/doris/planner/OlapTableSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,9 @@

import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import com.google.common.collect.Range;
import com.google.common.collect.Sets;

Expand Down Expand Up @@ -295,26 +296,27 @@ private TOlapTablePartitionParam createPartition(long dbId, OlapTable table) thr

private TOlapTableLocationParam createLocation(OlapTable table) throws UserException {
TOlapTableLocationParam locationParam = new TOlapTableLocationParam();
Map<Long, Long> allPathBeMap = Maps.newHashMap();
// BE id -> path hash
Multimap<Long, Long> allBePathsMap = HashMultimap.create();
for (Partition partition : table.getPartitions()) {
int quorum = table.getPartitionInfo().getReplicationNum(partition.getId()) / 2 + 1;
for (MaterializedIndex index : partition.getMaterializedIndices()) {
// we should ensure the replica backend is alive
// otherwise, there will be a 'unknown node id, id=xxx' error for stream load
for (Tablet tablet : index.getTablets()) {
Map<Long, Long> pathBeMap = tablet.getNormalReplicaBackendPathMap();
if (pathBeMap.size() < quorum) {
throw new UserException("tablet " + tablet.getId() + " has few replicas: " + pathBeMap.size());
Multimap<Long, Long> bePathsMap = tablet.getNormalReplicaBackendPathMap();
if (bePathsMap.keySet().size() < quorum) {
throw new UserException("tablet " + tablet.getId() + " has few replicas: " + bePathsMap.keySet().size());
}
locationParam.addToTablets(new TTabletLocation(tablet.getId(), Lists.newArrayList(pathBeMap.values())));
allPathBeMap.putAll(pathBeMap);
locationParam.addToTablets(new TTabletLocation(tablet.getId(), Lists.newArrayList(bePathsMap.keySet())));
allBePathsMap.putAll(bePathsMap);
}
}
}

// check if disk capacity reach limit
// this is for load process, so use high water mark to check
Status st = Catalog.getCurrentSystemInfo().checkExceedDiskCapacityLimit(allPathBeMap, true);
Status st = Catalog.getCurrentSystemInfo().checkExceedDiskCapacityLimit(allBePathsMap, true);
if (!st.ok()) {
throw new DdlException(st.getErrorMsg());
}
Expand Down
19 changes: 11 additions & 8 deletions fe/src/main/java/org/apache/doris/system/SystemInfoService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;

import org.apache.commons.validator.routines.InetAddressValidator;
Expand Down Expand Up @@ -1116,19 +1117,21 @@ public Set<String> getClusterNames() {

/*
* Check if the specified disks' capacity has reached the limit.
* pathBeMap is (path hash -> BE id)
* bePathsMap is (BE id -> list of path hash)
* If floodStage is true, it will check with the floodStage threshold.
*
* return Status.OK if not reach the limit
*/
public Status checkExceedDiskCapacityLimit(Map<Long, Long> pathBeMap, boolean floodStage) {
LOG.debug("pathBeMap: {}", pathBeMap);
public Status checkExceedDiskCapacityLimit(Multimap<Long, Long> bePathsMap, boolean floodStage) {
LOG.debug("pathBeMap: {}", bePathsMap);
ImmutableMap<Long, DiskInfo> pathHashToDiskInfo = pathHashToDishInfoRef.get();
for (Long pathHash : pathBeMap.keySet()) {
DiskInfo diskInfo = pathHashToDiskInfo.get(pathHash);
if (diskInfo != null && diskInfo.exceedLimit(floodStage)) {
return new Status(TStatusCode.CANCELLED,
"disk " + pathHash + " on backend " + pathBeMap.get(pathHash) + " exceed limit usage");
for (Long beId : bePathsMap.keySet()) {
for (Long pathHash : bePathsMap.get(beId)) {
DiskInfo diskInfo = pathHashToDiskInfo.get(pathHash);
if (diskInfo != null && diskInfo.exceedLimit(floodStage)) {
return new Status(TStatusCode.CANCELLED,
"disk " + pathHash + " on backend " + beId + " exceed limit usage");
}
}
}
return Status.OK;
Expand Down