This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 1f4c917f3d HDDS-8957. Move log messages for creating and opening
pipelines outside of locks (#5006)
1f4c917f3d is described below
commit 1f4c917f3d0f28a19c9b0103d2d5f77566622cf9
Author: Stephen O'Donnell <[email protected]>
AuthorDate: Thu Jun 29 21:38:30 2023 +0100
HDDS-8957. Move log messages for creating and opening pipelines outside of
locks (#5006)
---
.../apache/hadoop/hdds/scm/pipeline/BackgroundPipelineCreator.java | 3 ++-
.../org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java | 7 -------
.../org/apache/hadoop/hdds/scm/pipeline/PipelineReportHandler.java | 1 +
.../hadoop/hdds/scm/pipeline/WritableECContainerProvider.java | 1 +
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/BackgroundPipelineCreator.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/BackgroundPipelineCreator.java
index d8a1a9403f..5abe07a022 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/BackgroundPipelineCreator.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/BackgroundPipelineCreator.java
@@ -229,7 +229,8 @@ public class BackgroundPipelineCreator implements
SCMService {
(ReplicationConfig) it.next();
try {
- pipelineManager.createPipeline(replicationConfig);
+ Pipeline pipeline = pipelineManager.createPipeline(replicationConfig);
+ LOG.info("Created new pipeline {}", pipeline);
} catch (IOException ioe) {
it.remove();
} catch (Throwable t) {
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java
index b1186ef332..d5cb5504eb 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java
@@ -296,7 +296,6 @@ public class PipelineManagerImpl implements PipelineManager
{
} finally {
releaseWriteLock();
}
- LOG.info("Added pipeline {}.", pipeline);
recordMetricsForPipeline(pipeline);
}
@@ -422,7 +421,6 @@ public class PipelineManagerImpl implements PipelineManager
{
HddsProtos.PipelineID pipelineIdProtobuf = pipelineId.getProtobuf();
acquireWriteLock();
final Pipeline pipeline;
- boolean opened = false;
try {
pipeline = stateManager.getPipeline(pipelineId);
if (pipeline.isClosed()) {
@@ -431,15 +429,10 @@ public class PipelineManagerImpl implements
PipelineManager {
if (pipeline.getPipelineState() == Pipeline.PipelineState.ALLOCATED) {
stateManager.updatePipelineState(pipelineIdProtobuf,
HddsProtos.PipelineState.PIPELINE_OPEN);
- opened = true;
}
} finally {
releaseWriteLock();
}
-
- if (opened) {
- LOG.info("Pipeline {} moved to OPEN state", pipeline);
- }
metrics.incNumPipelineCreated();
metrics.createPerPipelineMetrics(pipeline);
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineReportHandler.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineReportHandler.java
index 134544541f..dcc7bdb3fb 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineReportHandler.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineReportHandler.java
@@ -133,6 +133,7 @@ public class PipelineReportHandler implements
}
if (pipeline.isHealthy()) {
pipelineManager.openPipeline(pipelineID);
+ LOGGER.info("Opened pipeline {}", pipelineID);
}
}
if (pipeline.isHealthy()) {
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/WritableECContainerProvider.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/WritableECContainerProvider.java
index d95e539c10..523ba19cde 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/WritableECContainerProvider.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/WritableECContainerProvider.java
@@ -191,6 +191,7 @@ public class WritableECContainerProvider
ContainerInfo container =
containerManager.getMatchingContainer(size, owner, newPipeline);
pipelineManager.openPipeline(newPipeline.getId());
+ LOG.info("Created and opened new pipeline {}", newPipeline);
return container;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
