Skip to content

Commit ebbda18

Browse files
arp7arp7
authored
HDDS-1198. Rename chill mode to safe mode. Contributed by Siddharth Wagle. (#737)
1 parent 1943db5 commit ebbda18

File tree

64 files changed

+702
-702
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+702
-702
lines changed

‎hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/client/ContainerOperationClient.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -447,22 +447,22 @@ public long getContainerSize(long containerID) throws IOException {
447447
}
448448

449449
/**
450-
* Check if SCM is in chill mode.
450+
* Check if SCM is in safe mode.
451451
*
452-
* @return Returns true if SCM is in chill mode else returns false.
452+
* @return Returns true if SCM is in safe mode else returns false.
453453
* @throws IOException
454454
*/
455-
public boolean inChillMode() throws IOException {
456-
return storageContainerLocationClient.inChillMode();
455+
public boolean inSafeMode() throws IOException {
456+
return storageContainerLocationClient.inSafeMode();
457457
}
458458

459459
/**
460-
* Force SCM out of chill mode.
460+
* Force SCM out of safe mode.
461461
*
462462
* @return returns true if operation is successful.
463463
* @throws IOException
464464
*/
465-
public boolean forceExitChillMode() throws IOException {
466-
return storageContainerLocationClient.forceExitChillMode();
465+
public boolean forceExitSafeMode() throws IOException {
466+
return storageContainerLocationClient.forceExitSafeMode();
467467
}
468468
}

‎hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -63,47 +63,47 @@ public final class HddsConfigKeys {
6363
public static final String HDDS_CONTAINER_CLOSE_THRESHOLD =
6464
"hdds.container.close.threshold";
6565
public static final float HDDS_CONTAINER_CLOSE_THRESHOLD_DEFAULT = 0.9f;
66-
public static final String HDDS_SCM_CHILLMODE_ENABLED =
67-
"hdds.scm.chillmode.enabled";
66+
public static final String HDDS_SCM_SAFEMODE_ENABLED =
67+
"hdds.scm.safemode.enabled";
6868
public static final String HDDS_CONTAINERSCRUB_ENABLED =
6969
"hdds.containerscrub.enabled";
7070
public static final boolean HDDS_CONTAINERSCRUB_ENABLED_DEFAULT = false;
71-
public static final boolean HDDS_SCM_CHILLMODE_ENABLED_DEFAULT = true;
72-
public static final String HDDS_SCM_CHILLMODE_MIN_DATANODE =
73-
"hdds.scm.chillmode.min.datanode";
74-
public static final int HDDS_SCM_CHILLMODE_MIN_DATANODE_DEFAULT = 1;
71+
public static final boolean HDDS_SCM_SAFEMODE_ENABLED_DEFAULT = true;
72+
public static final String HDDS_SCM_SAFEMODE_MIN_DATANODE =
73+
"hdds.scm.safemode.min.datanode";
74+
public static final int HDDS_SCM_SAFEMODE_MIN_DATANODE_DEFAULT = 1;
7575

7676

7777
public static final String
78-
HDDS_SCM_WAIT_TIME_AFTER_CHILL_MODE_EXIT =
79-
"hdds.scm.wait.time.after.chillmode.exit";
78+
HDDS_SCM_WAIT_TIME_AFTER_SAFE_MODE_EXIT =
79+
"hdds.scm.wait.time.after.safemode.exit";
8080

8181
public static final String
82-
HDDS_SCM_WAIT_TIME_AFTER_CHILL_MODE_EXIT_DEFAULT = "5m";
82+
HDDS_SCM_WAIT_TIME_AFTER_SAFE_MODE_EXIT_DEFAULT = "5m";
8383

84-
public static final String HDDS_SCM_CHILLMODE_PIPELINE_AVAILABILITY_CHECK =
85-
"hdds.scm.chillmode.pipeline-availability.check";
84+
public static final String HDDS_SCM_SAFEMODE_PIPELINE_AVAILABILITY_CHECK =
85+
"hdds.scm.safemode.pipeline-availability.check";
8686
public static final boolean
87-
HDDS_SCM_CHILLMODE_PIPELINE_AVAILABILITY_CHECK_DEFAULT = false;
87+
HDDS_SCM_SAFEMODE_PIPELINE_AVAILABILITY_CHECK_DEFAULT = false;
8888

8989
// % of containers which should have at least one reported replica
90-
// before SCM comes out of chill mode.
91-
public static final String HDDS_SCM_CHILLMODE_THRESHOLD_PCT =
92-
"hdds.scm.chillmode.threshold.pct";
93-
public static final double HDDS_SCM_CHILLMODE_THRESHOLD_PCT_DEFAULT = 0.99;
90+
// before SCM comes out of safe mode.
91+
public static final String HDDS_SCM_SAFEMODE_THRESHOLD_PCT =
92+
"hdds.scm.safemode.threshold.pct";
93+
public static final double HDDS_SCM_SAFEMODE_THRESHOLD_PCT_DEFAULT = 0.99;
9494

9595

9696
// percentage of healthy pipelines, where all 3 datanodes are reported in the
9797
// pipeline.
98-
public static final String HDDS_SCM_CHILLMODE_HEALTHY_PIPELINE_THRESHOLD_PCT =
99-
"hdds.scm.chillmode.healthy.pipelie.pct";
98+
public static final String HDDS_SCM_SAFEMODE_HEALTHY_PIPELINE_THRESHOLD_PCT =
99+
"hdds.scm.safemode.healthy.pipelie.pct";
100100
public static final double
101-
HDDS_SCM_CHILLMODE_HEALTHY_PIPELINE_THRESHOLD_PCT_DEFAULT = 0.10;
101+
HDDS_SCM_SAFEMODE_HEALTHY_PIPELINE_THRESHOLD_PCT_DEFAULT = 0.10;
102102

103-
public static final String HDDS_SCM_CHILLMODE_ONE_NODE_REPORTED_PIPELINE_PCT =
104-
"hdds.scm.chillmode.atleast.one.node.reported.pipeline.pct";
103+
public static final String HDDS_SCM_SAFEMODE_ONE_NODE_REPORTED_PIPELINE_PCT =
104+
"hdds.scm.safemode.atleast.one.node.reported.pipeline.pct";
105105
public static final double
106-
HDDS_SCM_CHILLMODE_ONE_NODE_REPORTED_PIPELINE_PCT_DEFAULT = 0.90;
106+
HDDS_SCM_SAFEMODE_ONE_NODE_REPORTED_PIPELINE_PCT_DEFAULT = 0.90;
107107

108108
public static final String HDDS_LOCK_MAX_CONCURRENCY =
109109
"hdds.lock.max.concurrency";

‎hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/client/ScmClient.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,18 +189,18 @@ Pipeline createReplicationPipeline(HddsProtos.ReplicationType type,
189189
void closePipeline(HddsProtos.PipelineID pipelineID) throws IOException;
190190

191191
/**
192-
* Check if SCM is in chill mode.
192+
* Check if SCM is in safe mode.
193193
*
194-
* @return Returns true if SCM is in chill mode else returns false.
194+
* @return Returns true if SCM is in safe mode else returns false.
195195
* @throws IOException
196196
*/
197-
boolean inChillMode() throws IOException;
197+
boolean inSafeMode() throws IOException;
198198

199199
/**
200-
* Force SCM out of chill mode.
200+
* Force SCM out of safe mode.
201201
*
202202
* @return returns true if operation is successful.
203203
* @throws IOException
204204
*/
205-
boolean forceExitChillMode() throws IOException;
205+
boolean forceExitSafeMode() throws IOException;
206206
}

‎hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocol.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,18 +163,18 @@ Pipeline createReplicationPipeline(HddsProtos.ReplicationType type,
163163
ScmInfo getScmInfo() throws IOException;
164164

165165
/**
166-
* Check if SCM is in chill mode.
166+
* Check if SCM is in safe mode.
167167
*
168-
* @return Returns true if SCM is in chill mode else returns false.
168+
* @return Returns true if SCM is in safe mode else returns false.
169169
* @throws IOException
170170
*/
171-
boolean inChillMode() throws IOException;
171+
boolean inSafeMode() throws IOException;
172172

173173
/**
174-
* Force SCM out of Chill mode.
174+
* Force SCM out of Safe mode.
175175
*
176176
* @return returns true if operation is successful.
177177
* @throws IOException
178178
*/
179-
boolean forceExitChillMode() throws IOException;
179+
boolean forceExitSafeMode() throws IOException;
180180
}

‎hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.ListPipelineRequestProto;
2424
import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.ListPipelineResponseProto;
2525
import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.ClosePipelineRequestProto;
26-
import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.ForceExitChillModeRequestProto;
27-
import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.ForceExitChillModeResponseProto;
26+
import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.ForceExitSafeModeRequestProto;
27+
import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.ForceExitSafeModeResponseProto;
2828
import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.GetContainerWithPipelineRequestProto;
2929
import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.GetContainerWithPipelineResponseProto;
30-
import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.InChillModeRequestProto;
31-
import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.InChillModeResponseProto;
30+
import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.InSafeModeRequestProto;
31+
import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.InSafeModeResponseProto;
3232
import org.apache.hadoop.hdds.scm.ScmInfo;
3333
import org.apache.hadoop.hdds.scm.container.common.helpers.ContainerWithPipeline;
3434
import org.apache.hadoop.hdds.scm.container.ContainerInfo;
@@ -370,38 +370,38 @@ public ScmInfo getScmInfo() throws IOException {
370370
}
371371

372372
/**
373-
* Check if SCM is in chill mode.
373+
* Check if SCM is in safe mode.
374374
*
375-
* @return Returns true if SCM is in chill mode else returns false.
375+
* @return Returns true if SCM is in safe mode else returns false.
376376
* @throws IOException
377377
*/
378378
@Override
379-
public boolean inChillMode() throws IOException {
380-
InChillModeRequestProto request =
381-
InChillModeRequestProto.getDefaultInstance();
379+
public boolean inSafeMode() throws IOException {
380+
InSafeModeRequestProto request =
381+
InSafeModeRequestProto.getDefaultInstance();
382382
try {
383-
InChillModeResponseProto resp = rpcProxy.inChillMode(
383+
InSafeModeResponseProto resp = rpcProxy.inSafeMode(
384384
NULL_RPC_CONTROLLER, request);
385-
return resp.getInChillMode();
385+
return resp.getInSafeMode();
386386
} catch (ServiceException e) {
387387
throw ProtobufHelper.getRemoteException(e);
388388
}
389389
}
390390

391391
/**
392-
* Force SCM out of Chill mode.
392+
* Force SCM out of Safe mode.
393393
*
394394
* @return returns true if operation is successful.
395395
* @throws IOException
396396
*/
397397
@Override
398-
public boolean forceExitChillMode() throws IOException {
399-
ForceExitChillModeRequestProto request =
400-
ForceExitChillModeRequestProto.getDefaultInstance();
398+
public boolean forceExitSafeMode() throws IOException {
399+
ForceExitSafeModeRequestProto request =
400+
ForceExitSafeModeRequestProto.getDefaultInstance();
401401
try {
402-
ForceExitChillModeResponseProto resp = rpcProxy
403-
.forceExitChillMode(NULL_RPC_CONTROLLER, request);
404-
return resp.getExitedChillMode();
402+
ForceExitSafeModeResponseProto resp = rpcProxy
403+
.forceExitSafeMode(NULL_RPC_CONTROLLER, request);
404+
return resp.getExitedSafeMode();
405405
} catch (ServiceException e) {
406406
throw ProtobufHelper.getRemoteException(e);
407407
}

‎hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/audit/SCMAction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ public enum SCMAction implements AuditAction {
3434
LIST_PIPELINE,
3535
CLOSE_PIPELINE,
3636
DELETE_CONTAINER,
37-
IN_CHILL_MODE,
38-
FORCE_EXIT_CHILL_MODE;
37+
IN_SAFE_MODE,
38+
FORCE_EXIT_SAFE_MODE;
3939

4040
@Override
4141
public String getAction() {

‎hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerLocationProtocolServerSideTranslatorPB.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424

2525
import org.apache.hadoop.classification.InterfaceAudience;
2626
import org.apache.hadoop.hdds.protocol.proto
27-
.StorageContainerLocationProtocolProtos.InChillModeRequestProto;
27+
.StorageContainerLocationProtocolProtos.InSafeModeRequestProto;
2828
import org.apache.hadoop.hdds.protocol.proto
29-
.StorageContainerLocationProtocolProtos.InChillModeResponseProto;
29+
.StorageContainerLocationProtocolProtos.InSafeModeResponseProto;
3030
import org.apache.hadoop.hdds.protocol.proto
31-
.StorageContainerLocationProtocolProtos.ForceExitChillModeRequestProto;
31+
.StorageContainerLocationProtocolProtos.ForceExitSafeModeRequestProto;
3232
import org.apache.hadoop.hdds.protocol.proto
33-
.StorageContainerLocationProtocolProtos.ForceExitChillModeResponseProto;
33+
.StorageContainerLocationProtocolProtos.ForceExitSafeModeResponseProto;
3434
import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.GetContainerWithPipelineRequestProto;
3535
import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.GetContainerWithPipelineResponseProto;
3636
import org.apache.hadoop.hdds.scm.ScmInfo;
@@ -282,26 +282,26 @@ public HddsProtos.GetScmInfoRespsonseProto getScmInfo(
282282
}
283283

284284
@Override
285-
public InChillModeResponseProto inChillMode(
285+
public InSafeModeResponseProto inSafeMode(
286286
RpcController controller,
287-
InChillModeRequestProto request) throws ServiceException {
287+
InSafeModeRequestProto request) throws ServiceException {
288288
try (Scope scope = TracingUtil
289-
.importAndCreateScope("inChillMode", request.getTraceID())) {
290-
return InChillModeResponseProto.newBuilder()
291-
.setInChillMode(impl.inChillMode()).build();
289+
.importAndCreateScope("inSafeMode", request.getTraceID())) {
290+
return InSafeModeResponseProto.newBuilder()
291+
.setInSafeMode(impl.inSafeMode()).build();
292292
} catch (IOException ex) {
293293
throw new ServiceException(ex);
294294
}
295295
}
296296

297297
@Override
298-
public ForceExitChillModeResponseProto forceExitChillMode(
299-
RpcController controller, ForceExitChillModeRequestProto request)
298+
public ForceExitSafeModeResponseProto forceExitSafeMode(
299+
RpcController controller, ForceExitSafeModeRequestProto request)
300300
throws ServiceException {
301301
try (Scope scope = TracingUtil
302-
.importAndCreateScope("forceExitChillMode", request.getTraceID())) {
303-
return ForceExitChillModeResponseProto.newBuilder()
304-
.setExitedChillMode(impl.forceExitChillMode()).build();
302+
.importAndCreateScope("forceExitSafeMode", request.getTraceID())) {
303+
return ForceExitSafeModeResponseProto.newBuilder()
304+
.setExitedSafeMode(impl.forceExitSafeMode()).build();
305305
} catch (IOException ex) {
306306
throw new ServiceException(ex);
307307
}

‎hadoop-hdds/common/src/main/proto/ScmBlockLocationProtocol.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ message DeleteKeyBlocksResultProto {
8888
message DeleteScmBlockResult {
8989
enum Result {
9090
success = 1;
91-
chillMode = 2;
91+
safeMode = 2;
9292
errorNotFound = 3;
9393
unknownFailure = 4;
9494
}

‎hadoop-hdds/common/src/main/proto/StorageContainerLocationProtocol.proto‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -176,20 +176,20 @@ message ClosePipelineRequestProto {
176176
message ClosePipelineResponseProto {
177177
}
178178

179-
message InChillModeRequestProto {
179+
message InSafeModeRequestProto {
180180
optional string traceID = 1;
181181
}
182182

183-
message InChillModeResponseProto {
184-
required bool inChillMode = 1;
183+
message InSafeModeResponseProto {
184+
required bool inSafeMode = 1;
185185
}
186186

187-
message ForceExitChillModeRequestProto {
187+
message ForceExitSafeModeRequestProto {
188188
optional string traceID = 1;
189189
}
190190

191-
message ForceExitChillModeResponseProto {
192-
required bool exitedChillMode = 1;
191+
message ForceExitSafeModeResponseProto {
192+
required bool exitedSafeMode = 1;
193193
}
194194

195195
/**
@@ -265,14 +265,14 @@ service StorageContainerLocationProtocolService {
265265
returns (GetScmInfoRespsonseProto);
266266

267267
/**
268-
* Checks if SCM is in ChillMode.
268+
* Checks if SCM is in SafeMode.
269269
*/
270-
rpc inChillMode(InChillModeRequestProto)
271-
returns (InChillModeResponseProto);
270+
rpc inSafeMode(InSafeModeRequestProto)
271+
returns (InSafeModeResponseProto);
272272

273273
/**
274274
* Returns information about SCM.
275275
*/
276-
rpc forceExitChillMode(ForceExitChillModeRequestProto)
277-
returns (ForceExitChillModeResponseProto);
276+
rpc forceExitSafeMode(ForceExitSafeModeRequestProto)
277+
returns (ForceExitSafeModeResponseProto);
278278
}

0 commit comments

Comments
 (0)