Skip to content
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

[Flink] Fix source split when context reader missing #564

Merged
merged 3 commits into from
Nov 23, 2024
Merged

[Flink] Fix source split when context reader missing #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20df501
fix source split when context reader missing
dmetasoul01 Nov 22, 2024
d21bfcc
fix resource file loading
dmetasoul01 Nov 22, 2024
ac25f33
fix npe
dmetasoul01 Nov 22, 2024
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
24 changes: 16 additions & 8 deletions lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/jnr/JnrLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@

import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.net.URLConnection;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.util.HashMap;
Expand Down Expand Up @@ -37,20 +38,27 @@ public synchronized static void tryLoad() {

String finalPath = null;

if (JnrLoader.class.getClassLoader().getResource(libName) != null) {
try {
File temp = File.createTempFile(libName + "_", ".tmp", new File(System.getProperty("java.io.tmpdir")));
temp.deleteOnExit();
try (final InputStream is = JnrLoader.class.getClassLoader().getResourceAsStream(libName)) {
try {
URL url = JnrLoader.class.getClassLoader().getResource(libName);
if (url == null) {
throw new FileNotFoundException(libName);
}
URLConnection connection = url.openConnection();
if (connection != null) {
connection.setUseCaches(false);
try (final InputStream is = connection.getInputStream()) {
if (is == null) {
throw new FileNotFoundException(libName);
}
File temp = File.createTempFile(libName + "_", ".tmp", new File(System.getProperty("java.io.tmpdir")));
temp.deleteOnExit();
Files.copy(is, temp.toPath(), StandardCopyOption.REPLACE_EXISTING);
finalPath = temp.getAbsolutePath();
}
} catch (IOException e) {
throw new IllegalStateException("error loading native libraries: " + e);
}
} catch (Exception e) {
e.printStackTrace();
throw new IllegalStateException("error loading native libraries: " + e);
}

if (finalPath != null) {
Expand Down
19 changes: 14 additions & 5 deletions ...ain/java/org/apache/flink/lakesoul/source/LakeSoulAllPartitionDynamicSplitEnumerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,15 @@ public void start() {
@Override
public synchronized void handleSplitRequest(int subtaskId, @Nullable String requesterHostname) {
LOG.info("handleSplitRequest subTaskId {}, oid {}, tid {}",
System.identityHashCode(this),
subtaskId, Thread.currentThread().getId());
subtaskId, System.identityHashCode(this), Thread.currentThread().getId());
if (!context.registeredReaders().containsKey(subtaskId)) {
// reader failed between sending the request and now. skip this request.
return;
}
int tasksSize = context.registeredReaders().size();
if (tasksSize == 0) {
return;
}
Optional<LakeSoulPartitionSplit> nextSplit = this.splitAssigner.getNext(subtaskId, tasksSize);
if (nextSplit.isPresent()) {
context.assignSplit(nextSplit.get(), subtaskId);
Expand Down Expand Up @@ -128,14 +130,21 @@ private synchronized void processDiscoveredSplits(
LOG.error("Failed to enumerate files", error);
return;
}
LOG.info("Process discovered splits {}, oid {}, tid {}", splits,
System.identityHashCode(this),
Thread.currentThread().getId());
int tasksSize = context.registeredReaders().size();
LOG.info("Process discovered splits {}, taskSize {}, oid {}, tid {}", splits,
tasksSize, System.identityHashCode(this),
Thread.currentThread().getId());
if (tasksSize == 0) {
return;
}
this.splitAssigner.addSplits(splits);
Iterator<Integer> iter = taskIdsAwaitingSplit.iterator();
while (iter.hasNext()) {
int taskId = iter.next();
if (!context.registeredReaders().containsKey(taskId)) {
iter.remove();
continue;
}
Optional<LakeSoulPartitionSplit> al = this.splitAssigner.getNext(taskId, tasksSize);
if (al.isPresent()) {
context.assignSplit(al.get(), taskId);
Expand Down
24 changes: 16 additions & 8 deletions ...e-io/lakesoul-io-java/src/main/java/com/dmetasoul/lakesoul/lakesoul/io/jnr/JnrLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@

import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.net.URLConnection;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.util.HashMap;
Expand Down Expand Up @@ -38,20 +39,27 @@ public synchronized static void tryLoad() {

String finalPath = null;

if (JnrLoader.class.getClassLoader().getResource(libName) != null) {
try {
File temp = File.createTempFile(libName + "_", ".tmp", new File(System.getProperty("java.io.tmpdir")));
temp.deleteOnExit();
try (final InputStream is = JnrLoader.class.getClassLoader().getResourceAsStream(libName)) {
try {
URL url = JnrLoader.class.getClassLoader().getResource(libName);
if (url == null) {
throw new FileNotFoundException(libName);
}
URLConnection connection = url.openConnection();
if (connection != null) {
connection.setUseCaches(false);
try (final InputStream is = connection.getInputStream()) {
if (is == null) {
throw new FileNotFoundException(libName);
}
File temp = File.createTempFile(libName + "_", ".tmp", new File(System.getProperty("java.io.tmpdir")));
temp.deleteOnExit();
Files.copy(is, temp.toPath(), StandardCopyOption.REPLACE_EXISTING);
finalPath = temp.getAbsolutePath();
}
} catch (IOException e) {
throw new IllegalStateException("error loading native libraries: " + e);
}
} catch (Exception e) {
e.printStackTrace();
throw new IllegalStateException("error loading native libraries: " + e);
}

if (finalPath != null) {
Expand Down
Loading