Mirror
/
seaweedfs
mirror of https://github.com/seaweedfs/seaweedfs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

less logs

pull/7526/head
chrislu 1 week ago
parent
8af6692ace
commit
82266d8271
5 changed files with 43 additions and 97 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 84
      other/java/client/src/main/java/seaweedfs/client/SeaweedOutputStream.java
  2. 15
      other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java
  3. 11
      other/java/client/src/main/java/seaweedfs/client/SeaweedWrite.java
  4. 23
      other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java
  5. 7
      other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedHadoopOutputStream.java

84
other/java/client/src/main/java/seaweedfs/client/SeaweedOutputStream.java
View File

@ -49,8 +49,7 @@ public class SeaweedOutputStream extends OutputStream {
public SeaweedOutputStream(FilerClient filerClient, final String path, FilerProto.Entry.Builder entry, public SeaweedOutputStream(FilerClient filerClient, final String path, FilerProto.Entry.Builder entry,
final long position, final int bufferSize, final String replication) { final long position, final int bufferSize, final String replication) {
LOG.warn("[DEBUG-2024] SeaweedOutputStream BASE constructor called: path={} position={} bufferSize={}",
path, position, bufferSize);
this.filerClient = filerClient; this.filerClient = filerClient;
this.replication = replication; this.replication = replication;
this.path = path; this.path = path;
@ -110,9 +109,7 @@ public class SeaweedOutputStream extends OutputStream {
long virtualPos = position + buffer.position(); long virtualPos = position + buffer.position();
if (path.contains("parquet")) { if (path.contains("parquet")) {
LOG.warn(
"[DEBUG-2024] getPos() #{}: returning virtualPos={} (flushed={} + buffered={}) totalBytesWritten={} writeCalls={}",
getPosCallCount, virtualPos, position, buffer.position(), totalBytesWritten, writeCallCount);
} }
return virtualPos; return virtualPos;
@ -144,8 +141,7 @@ public class SeaweedOutputStream extends OutputStream {
private synchronized void flushWrittenBytesToServiceInternal(final long offset) throws IOException { private synchronized void flushWrittenBytesToServiceInternal(final long offset) throws IOException {
try { try {
LOG.info("[DEBUG-2024] flushWrittenBytesToServiceInternal: path={} offset={} #chunks={}",
path, offset, entry.getChunksCount());
// Set the file size in attributes based on our position // Set the file size in attributes based on our position
// This ensures Parquet footer metadata matches what we actually wrote // This ensures Parquet footer metadata matches what we actually wrote
@ -199,10 +195,7 @@ public class SeaweedOutputStream extends OutputStream {
// Always log writes to see the complete pattern // Always log writes to see the complete pattern
if (length >= 20 || writeCallCount >= 220 || writeCallCount % 50 == 0) { if (length >= 20 || writeCallCount >= 220 || writeCallCount % 50 == 0) {
LOG.warn(
"[DEBUG-2024] WRITE #{}: {} bytes | virtualPos={} (flushed={} + buffered={}) | totalWritten={} | file={}",
writeCallCount, length, virtualPosition, position, beforeBufferPos,
totalBytesWritten, path.substring(path.lastIndexOf('/') + 1));
} }
} }
@ -229,9 +222,7 @@ public class SeaweedOutputStream extends OutputStream {
currentOffset += writableBytes; currentOffset += writableBytes;
if (path.contains("parquet")) { if (path.contains("parquet")) {
LOG.warn(
"[DEBUG-2024] Buffer FLUSH: posBeforeFlush={} flushingBufferSize={} newPositionAfterFlush={} totalWritten={}",
posBeforeWrite, bufferSize, position + bufferSize, totalBytesWritten);
} }
writeCurrentBufferToService(); writeCurrentBufferToService();
@ -250,10 +241,7 @@ public class SeaweedOutputStream extends OutputStream {
@Override @Override
public void flush() throws IOException { public void flush() throws IOException {
if (path.contains("parquet") || path.contains("employees")) { if (path.contains("parquet") || path.contains("employees")) {
LOG.warn(
"[DEBUG-2024] flush() CALLED: supportFlush={} virtualPos={} flushedPos={} buffer.position()={} totalWritten={} path={}",
supportFlush, virtualPosition, position, buffer.position(), totalBytesWritten,
path.substring(path.lastIndexOf('/') + 1));
} }
if (supportFlush) { if (supportFlush) {
@ -276,9 +264,7 @@ public class SeaweedOutputStream extends OutputStream {
} }
int bufferPosBeforeFlush = buffer.position(); int bufferPosBeforeFlush = buffer.position();
LOG.info(
"[DEBUG-2024] close START: path={} virtualPos={} flushedPos={} buffer.position()={} totalBytesWritten={} writeCalls={}",
path, virtualPosition, position, bufferPosBeforeFlush, totalBytesWritten, writeCallCount);
try { try {
flushInternal(); flushInternal();
threadExecutor.shutdown(); threadExecutor.shutdown();
@ -288,9 +274,7 @@ public class SeaweedOutputStream extends OutputStream {
// The real issue is in Spark's file commit/rename process, not here. // The real issue is in Spark's file commit/rename process, not here.
// See BREAKTHROUGH_IO_COMPARISON.md for details. // See BREAKTHROUGH_IO_COMPARISON.md for details.
LOG.info(
"[DEBUG-2024] close END: path={} virtualPos={} flushedPos={} totalBytesWritten={} writeCalls={} (buffer had {} bytes)",
path, virtualPosition, position, totalBytesWritten, writeCallCount, bufferPosBeforeFlush);
// Special logging for employees directory files (to help CI download timing) // Special logging for employees directory files (to help CI download timing)
if (path.contains("/test-spark/employees/") && path.endsWith(".parquet")) { if (path.contains("/test-spark/employees/") && path.endsWith(".parquet")) {
@ -337,22 +321,22 @@ public class SeaweedOutputStream extends OutputStream {
*/ */
private void ensureMetadataVisible() throws IOException { private void ensureMetadataVisible() throws IOException {
try { try {
LOG.warn("[DEBUG-2024] ensureMetadataVisible() CALLED for path={} size={}", path, position);
String parentDir = getParentDirectory(path); String parentDir = getParentDirectory(path);
String fileName = getFileName(path); String fileName = getFileName(path);
LOG.warn("[DEBUG-2024] Looking up: parentDir={} fileName={}", parentDir, fileName);
int maxRetries = 5; int maxRetries = 5;
long retryDelayMs = 10; // Start with 10ms long retryDelayMs = 10; // Start with 10ms
for (int attempt = 0; attempt < maxRetries; attempt++) { for (int attempt = 0; attempt < maxRetries; attempt++) {
try { try {
LOG.warn("[DEBUG-2024] Attempt {} to lookup metadata", attempt + 1);
// Lookup the entry to verify metadata is visible // Lookup the entry to verify metadata is visible
FilerProto.Entry lookedUpEntry = filerClient.lookupEntry(parentDir, fileName); FilerProto.Entry lookedUpEntry = filerClient.lookupEntry(parentDir, fileName);
LOG.warn("[DEBUG-2024] Lookup returned: {}", (lookedUpEntry != null ? "entry found" : "null"));
if (lookedUpEntry != null) { if (lookedUpEntry != null) {
long lookedUpSize = lookedUpEntry.getAttributes().getFileSize(); long lookedUpSize = lookedUpEntry.getAttributes().getFileSize();
@ -360,14 +344,12 @@ public class SeaweedOutputStream extends OutputStream {
if (lookedUpSize == position) { if (lookedUpSize == position) {
// Metadata is correct and visible // Metadata is correct and visible
if (attempt > 0) { if (attempt > 0) {
LOG.info("[DEBUG-2024] Metadata visible after {} retries: path={} size={}",
attempt, path, position);
} }
return; return;
} else { } else {
// Metadata is stale // Metadata is stale
LOG.warn("[DEBUG-2024] Metadata stale on attempt {}: path={} expected={} actual={}",
attempt + 1, path, position, lookedUpSize);
} }
} }
@ -381,17 +363,15 @@ public class SeaweedOutputStream extends OutputStream {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
throw new IOException("Interrupted while waiting for metadata visibility", e); throw new IOException("Interrupted while waiting for metadata visibility", e);
} catch (Exception e) { } catch (Exception e) {
LOG.warn("[DEBUG-2024] Error checking metadata visibility on attempt {}: {}",
attempt + 1, e.getMessage());
// Continue to next retry // Continue to next retry
} }
} }
// If we get here, metadata may still not be visible, but we've done our best // If we get here, metadata may still not be visible, but we've done our best
LOG.warn("[DEBUG-2024] Metadata may not be immediately visible after {} retries: path={} size={}",
maxRetries, path, position);
} catch (Exception e) { } catch (Exception e) {
LOG.error("[DEBUG-2024] EXCEPTION in ensureMetadataVisible(): {}", e.getMessage(), e);
// Don't throw - we don't want to fail the close() operation // Don't throw - we don't want to fail the close() operation
} }
} }
@ -401,14 +381,12 @@ public class SeaweedOutputStream extends OutputStream {
long positionBefore = position; long positionBefore = position;
if (path.contains("parquet") || path.contains("employees")) { if (path.contains("parquet") || path.contains("employees")) {
LOG.warn(
"[DEBUG-2024] writeCurrentBufferToService START: buffer.position()={} currentFlushedPosition={} totalWritten={} path={}",
bufferPos, position, totalBytesWritten, path.substring(path.lastIndexOf('/') + 1));
} }
if (bufferPos == 0) { if (bufferPos == 0) {
if (path.contains("parquet") || path.contains("employees")) { if (path.contains("parquet") || path.contains("employees")) {
LOG.warn("[DEBUG-2024] -> Skipping: buffer is empty");
} }
return; return;
} }
@ -417,9 +395,7 @@ public class SeaweedOutputStream extends OutputStream {
position += written; position += written;
if (path.contains("parquet") || path.contains("employees")) { if (path.contains("parquet") || path.contains("employees")) {
LOG.warn(
"[DEBUG-2024] writeCurrentBufferToService END: submitted {} bytes, flushedPosition {} -> {}, totalWritten={} path={}",
written, positionBefore, position, totalBytesWritten, path.substring(path.lastIndexOf('/') + 1));
} }
buffer = ByteBufferPool.request(bufferSize); buffer = ByteBufferPool.request(bufferSize);
@ -496,10 +472,7 @@ public class SeaweedOutputStream extends OutputStream {
protected synchronized void flushInternal() throws IOException { protected synchronized void flushInternal() throws IOException {
if (path.contains("parquet") || path.contains("employees")) { if (path.contains("parquet") || path.contains("employees")) {
LOG.warn(
"[DEBUG-2024] flushInternal() START: virtualPos={} flushedPos={} buffer.position()={} totalWritten={} path={}",
virtualPosition, position, buffer.position(), totalBytesWritten,
path.substring(path.lastIndexOf('/') + 1));
} }
maybeThrowLastError(); maybeThrowLastError();
@ -507,19 +480,13 @@ public class SeaweedOutputStream extends OutputStream {
flushWrittenBytesToService(); flushWrittenBytesToService();
if (path.contains("parquet") || path.contains("employees")) { if (path.contains("parquet") || path.contains("employees")) {
LOG.warn(
"[DEBUG-2024] flushInternal() END: virtualPos={} flushedPos={} buffer.position()={} totalWritten={} path={}",
virtualPosition, position, buffer.position(), totalBytesWritten,
path.substring(path.lastIndexOf('/') + 1));
} }
} }
protected synchronized void flushInternalAsync() throws IOException { protected synchronized void flushInternalAsync() throws IOException {
if (path.contains("parquet") || path.contains("employees")) { if (path.contains("parquet") || path.contains("employees")) {
LOG.warn(
"[DEBUG-2024] flushInternalAsync() START: virtualPos={} flushedPos={} buffer.position()={} totalWritten={} path={}",
virtualPosition, position, buffer.position(), totalBytesWritten,
path.substring(path.lastIndexOf('/') + 1));
} }
maybeThrowLastError(); maybeThrowLastError();
@ -527,10 +494,7 @@ public class SeaweedOutputStream extends OutputStream {
flushWrittenBytesToServiceAsync(); flushWrittenBytesToServiceAsync();
if (path.contains("parquet") || path.contains("employees")) { if (path.contains("parquet") || path.contains("employees")) {
LOG.warn(
"[DEBUG-2024] flushInternalAsync() END: virtualPos={} flushedPos={} buffer.position()={} totalWritten={} path={}",
virtualPosition, position, buffer.position(), totalBytesWritten,
path.substring(path.lastIndexOf('/') + 1));
} }
} }

15
other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java
View File

@ -28,12 +28,10 @@ public class SeaweedRead {
int originalRemaining = buf.remaining(); int originalRemaining = buf.remaining();
List<ChunkView> chunkViews = viewFromVisibles(visibleIntervals, position, originalRemaining); List<ChunkView> chunkViews = viewFromVisibles(visibleIntervals, position, originalRemaining);
LOG.warn("[DEBUG-2024] SeaweedRead.read(): position={} bufRemaining={} fileSize={} #chunkViews={}",
position, originalRemaining, fileSize, chunkViews.size());
if (chunkViews.isEmpty()) { if (chunkViews.isEmpty()) {
LOG.warn("[DEBUG-2024] SeaweedRead.read(): NO CHUNKS for position={} size={} fileSize={}",
position, originalRemaining, fileSize);
} }
Map<String, FilerProto.Locations> knownLocations = new HashMap<>(); Map<String, FilerProto.Locations> knownLocations = new HashMap<>();
@ -90,8 +88,7 @@ public class SeaweedRead {
} }
} catch (Exception e) { } catch (Exception e) {
LOG.error("[DEBUG-2024] Exception in chunk reading loop: position={} startOffset={} readCount={}",
position, startOffset, readCount, e);
throw e; throw e;
} }
@ -100,8 +97,7 @@ public class SeaweedRead {
// near the end of the file. // near the end of the file.
long limit = Math.min(position + originalRemaining, fileSize); long limit = Math.min(position + originalRemaining, fileSize);
LOG.warn("[DEBUG-2024] SeaweedRead.read(): After chunks: startOffset={} limit={} gap={}",
startOffset, limit, (limit - startOffset));
if (startOffset < limit) { if (startOffset < limit) {
long gap = limit - startOffset; long gap = limit - startOffset;
@ -111,8 +107,7 @@ public class SeaweedRead {
startOffset += gap; startOffset += gap;
} }
LOG.warn("[DEBUG-2024] SeaweedRead.read() COMPLETE: position={} startOffset={} limit={} readCount={}",
position, startOffset, limit, readCount);
return readCount; return readCount;
} }

11
other/java/client/src/main/java/seaweedfs/client/SeaweedWrite.java
View File

@ -125,8 +125,7 @@ public class SeaweedWrite {
String etag = multipartUpload(targetUrl, auth, bytes, bytesOffset, bytesLength, cipherKey); String etag = multipartUpload(targetUrl, auth, bytes, bytesOffset, bytesLength, cipherKey);
LOG.info("[DEBUG-2024] Wrote chunk to {} at offset {} size {} bytes, etag: {}", targetUrl, offset,
bytesLength, etag);
return FilerProto.FileChunk.newBuilder() return FilerProto.FileChunk.newBuilder()
.setFileId(fileId) .setFileId(fileId)
@ -151,13 +150,7 @@ public class SeaweedWrite {
// Check if there's a size mismatch with attributes // Check if there's a size mismatch with attributes
long attrFileSize = entry.getAttributes().getFileSize(); long attrFileSize = entry.getAttributes().getFileSize();
LOG.info(
"[DEBUG-2024] Writing metadata to {} with {} chunks, totalSize from chunks: {} bytes, attr.fileSize: {} bytes{}",
parentDirectory + "/" + entry.getName(),
chunks.size(),
totalSize,
attrFileSize,
(totalSize != attrFileSize) ? " MISMATCH!" : "");
entry.clearChunks(); entry.clearChunks();
entry.addAllChunks(chunks); entry.addAllChunks(chunks);

23
other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java
View File

@ -161,7 +161,7 @@ public class SeaweedFileSystemStore {
if (source.isRoot()) { if (source.isRoot()) {
return; return;
} }
LOG.warn("[DEBUG-2024] RENAME START: {} => {}", source, destination);
FilerProto.Entry entry = lookupEntry(source); FilerProto.Entry entry = lookupEntry(source);
if (entry == null) { if (entry == null) {
LOG.warn("rename non-existing source: {}", source); LOG.warn("rename non-existing source: {}", source);
@ -171,29 +171,27 @@ public class SeaweedFileSystemStore {
// Log source file metadata before rename // Log source file metadata before rename
long sourceSize = entry.getAttributes().getFileSize(); long sourceSize = entry.getAttributes().getFileSize();
int sourceChunks = entry.getChunksCount(); int sourceChunks = entry.getChunksCount();
LOG.warn("[DEBUG-2024] Source file metadata: size={} chunks={}", sourceSize, sourceChunks);
filerClient.mv(source.toUri().getPath(), destination.toUri().getPath()); filerClient.mv(source.toUri().getPath(), destination.toUri().getPath());
LOG.warn("[DEBUG-2024] RENAME COMPLETE: {} => {}", source, destination);
// Lookup destination to verify metadata was preserved // Lookup destination to verify metadata was preserved
FilerProto.Entry destEntry = lookupEntry(destination); FilerProto.Entry destEntry = lookupEntry(destination);
if (destEntry != null) { if (destEntry != null) {
long destSize = destEntry.getAttributes().getFileSize(); long destSize = destEntry.getAttributes().getFileSize();
int destChunks = destEntry.getChunksCount(); int destChunks = destEntry.getChunksCount();
LOG.warn("[DEBUG-2024] Destination file metadata: size={} chunks={}", destSize, destChunks);
if (sourceSize != destSize) { if (sourceSize != destSize) {
LOG.error("[DEBUG-2024] METADATA MISMATCH! Source size={} but destination size={}",
sourceSize, destSize);
} }
if (sourceChunks != destChunks) { if (sourceChunks != destChunks) {
LOG.error("[DEBUG-2024] CHUNK COUNT MISMATCH! Source chunks={} but destination chunks={}",
sourceChunks, destChunks);
} }
} else { } else {
LOG.error("[DEBUG-2024] Destination file not found after rename!");
} }
} }
@ -205,8 +203,7 @@ public class SeaweedFileSystemStore {
permission = permission == null ? FsPermission.getFileDefault() : permission; permission = permission == null ? FsPermission.getFileDefault() : permission;
LOG.warn("[DEBUG-2024] SeaweedFileSystemStore.createFile CALLED: path={} overwrite={} bufferSize={}",
path, overwrite, bufferSize);
LOG.debug("createFile path: {} overwrite: {} permission: {}", LOG.debug("createFile path: {} overwrite: {} permission: {}",
path, path,
overwrite, overwrite,
@ -243,9 +240,7 @@ public class SeaweedFileSystemStore {
SeaweedWrite.writeMeta(filerClient, getParentDirectory(path), entry); SeaweedWrite.writeMeta(filerClient, getParentDirectory(path), entry);
} }
LOG.warn(
"[DEBUG-2024] SeaweedFileSystemStore.createFile RETURNING SeaweedHadoopOutputStream: path={} bufferSize={}",
path, bufferSize);
return new SeaweedHadoopOutputStream(filerClient, path.toString(), entry, writePosition, bufferSize, return new SeaweedHadoopOutputStream(filerClient, path.toString(), entry, writePosition, bufferSize,
replication); replication);

7
other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedHadoopOutputStream.java
View File

@ -20,8 +20,7 @@ public class SeaweedHadoopOutputStream extends SeaweedOutputStream implements Sy
public SeaweedHadoopOutputStream(FilerClient filerClient, final String path, FilerProto.Entry.Builder entry, public SeaweedHadoopOutputStream(FilerClient filerClient, final String path, FilerProto.Entry.Builder entry,
final long position, final int bufferSize, final String replication) { final long position, final int bufferSize, final String replication) {
super(filerClient, path, entry, position, bufferSize, replication); super(filerClient, path, entry, position, bufferSize, replication);
LOG.warn("[DEBUG-2024] SeaweedHadoopOutputStream created: path={} position={} bufferSize={} replication={}",
path, position, bufferSize, replication);
} }
/** /**
@ -32,7 +31,7 @@ public class SeaweedHadoopOutputStream extends SeaweedOutputStream implements Sy
*/ */
@Override @Override
public void hsync() throws IOException { public void hsync() throws IOException {
LOG.warn("[DEBUG-2024] hsync() called on path: {}", getPath());
if (supportFlush) { if (supportFlush) {
flushInternal(); flushInternal();
} }
@ -46,7 +45,7 @@ public class SeaweedHadoopOutputStream extends SeaweedOutputStream implements Sy
*/ */
@Override @Override
public void hflush() throws IOException { public void hflush() throws IOException {
LOG.warn("[DEBUG-2024] hflush() called on path: {}", getPath());
if (supportFlush) { if (supportFlush) {
flushInternal(); flushInternal();
} }

Write Preview
Loading…
Cancel
Save