Skip to content

Commit dd8ddd3

Browse files
author
AWS
committed
Amazon Elastic MapReduce Update: Documentation updates for Amazon EMR
1 parent 716a3a1 commit dd8ddd3

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

‎.changes/next-release/feature-AmazonElasticMapReduce-4abad49.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"category": "Amazon Elastic MapReduce",
3+
"type": "feature",
4+
"description": "Documentation updates for Amazon EMR"
5+
}

‎services/emr/src/main/resources/codegen-resources/service-2.json

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"serviceId":"EMR",
1111
"signatureVersion":"v4",
1212
"targetPrefix":"ElasticMapReduce",
13-
"timestampFormat":"unixTimestamp",
1413
"uid":"elasticmapreduce-2009-03-31"
1514
},
1615
"operations":{
@@ -525,7 +524,7 @@
525524
"documentation":"<p>This option is for advanced users only. This is meta information about third-party applications that third-party vendors use for testing purposes.</p>"
526525
}
527526
},
528-
"documentation":"<p>An application is any Amazon or third-party software that you can add to the cluster. This structure contains a list of strings that indicates the software to use with the cluster and accepts a user argument list. Amazon EMR accepts and forwards the argument list to the corresponding installation script as bootstrap action argument. For more information, see <a href=\"http://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-mapr.html\">Using the MapR Distribution for Hadoop</a>. Currently supported values are:</p> <ul> <li> <p>\"mapr-m3\" - launch the cluster using MapR M3 Edition.</p> </li> <li> <p>\"mapr-m5\" - launch the cluster using MapR M5 Edition.</p> </li> <li> <p>\"mapr\" with the user arguments specifying \"--edition,m3\" or \"--edition,m5\" - launch the cluster using MapR M3 or M5 Edition, respectively.</p> </li> </ul> <note> <p>In Amazon EMR releases 4.x and later, the only accepted parameter is the application name. To pass arguments to applications, you supply a configuration for each application.</p> </note>"
527+
"documentation":"<p>With Amazon EMR release version 4.0 and later, the only accepted parameter is the application name. To pass arguments to applications, you use configuration classifications specified using configuration JSON objects. For more information, see <a href=\"http://docs.aws.amazon.com/emr/latest/ReleaseGuide/emr-configure-apps.html\">Configuring Applications</a>.</p> <p>With earlier Amazon EMR releases, the application is any Amazon or third-party software that you can add to the cluster. This structure contains a list of strings that indicates the software to use with the cluster and accepts a user argument list. Amazon EMR accepts and forwards the argument list to the corresponding installation script as bootstrap action argument.</p>"
529528
},
530529
"ApplicationList":{
531530
"type":"list",
@@ -1286,7 +1285,7 @@
12861285
},
12871286
"EmrManagedSlaveSecurityGroup":{
12881287
"shape":"String",
1289-
"documentation":"<p>The identifier of the Amazon EC2 security group for the slave nodes.</p>"
1288+
"documentation":"<p>The identifier of the Amazon EC2 security group for the core and task nodes.</p>"
12901289
},
12911290
"ServiceAccessSecurityGroup":{
12921291
"shape":"String",
@@ -1298,7 +1297,7 @@
12981297
},
12991298
"AdditionalSlaveSecurityGroups":{
13001299
"shape":"StringList",
1301-
"documentation":"<p>A list of additional Amazon EC2 security group IDs for the slave nodes.</p>"
1300+
"documentation":"<p>A list of additional Amazon EC2 security group IDs for the core and task nodes.</p>"
13021301
}
13031302
},
13041303
"documentation":"<p>Provides information about the EC2 instances in a cluster grouped by category. For example, key name, subnet ID, IAM instance profile, and so on.</p>"
@@ -2290,7 +2289,7 @@
22902289
},
22912290
"SlaveInstanceType":{
22922291
"shape":"InstanceType",
2293-
"documentation":"<p>The EC2 instance type of the slave nodes.</p>"
2292+
"documentation":"<p>The EC2 instance type of the core and task nodes.</p>"
22942293
},
22952294
"InstanceCount":{
22962295
"shape":"Integer",
@@ -2338,7 +2337,7 @@
23382337
},
23392338
"EmrManagedSlaveSecurityGroup":{
23402339
"shape":"XmlStringMaxLen256",
2341-
"documentation":"<p>The identifier of the Amazon EC2 security group for the slave nodes.</p>"
2340+
"documentation":"<p>The identifier of the Amazon EC2 security group for the core and task nodes.</p>"
23422341
},
23432342
"ServiceAccessSecurityGroup":{
23442343
"shape":"XmlStringMaxLen256",
@@ -2350,7 +2349,7 @@
23502349
},
23512350
"AdditionalSlaveSecurityGroups":{
23522351
"shape":"SecurityGroupsList",
2353-
"documentation":"<p>A list of additional Amazon EC2 security group IDs for the slave nodes.</p>"
2352+
"documentation":"<p>A list of additional Amazon EC2 security group IDs for the core and task nodes.</p>"
23542353
}
23552354
},
23562355
"documentation":"<p>A description of the Amazon EC2 instance on which the cluster (job flow) runs. A valid JobFlowInstancesConfig must contain either InstanceGroups or InstanceFleets, which is the recommended configuration. They cannot be used together. You may also have MasterInstanceType, SlaveInstanceType, and InstanceCount (all three must be present), but we don't recommend this configuration.</p>"
@@ -2377,11 +2376,11 @@
23772376
},
23782377
"SlaveInstanceType":{
23792378
"shape":"InstanceType",
2380-
"documentation":"<p>The Amazon EC2 slave node instance type.</p>"
2379+
"documentation":"<p>The Amazon EC2 core and task node instance type.</p>"
23812380
},
23822381
"InstanceCount":{
23832382
"shape":"Integer",
2384-
"documentation":"<p>The number of Amazon EC2 instances in the cluster. If the value is 1, the same instance serves as both the master and slave node. If the value is greater than 1, one instance is the master node and all others are slave nodes.</p>"
2383+
"documentation":"<p>The number of Amazon EC2 instances in the cluster. If the value is 1, the same instance serves as both the master and core and task node. If the value is greater than 1, one instance is the master node and all others are core and task nodes.</p>"
23852384
},
23862385
"InstanceGroups":{
23872386
"shape":"InstanceGroupDetailList",
@@ -2916,7 +2915,7 @@
29162915
},
29172916
"Applications":{
29182917
"shape":"ApplicationList",
2919-
"documentation":"<p>For Amazon EMR releases 4.0 and later. A list of applications for the cluster. Valid values are: \"Hadoop\", \"Hive\", \"Mahout\", \"Pig\", and \"Spark.\" They are case insensitive.</p>"
2918+
"documentation":"<p>Applies to Amazon EMR releases 4.0 and later. A case-insensitive list of applications for Amazon EMR to install and configure when launching the cluster. For a list of applications available for each Amazon EMR release version, see the <a href=\"http://docs.aws.amazon.com/emr/latest/ReleaseGuide/\">Amazon EMR Release Guide</a>.</p>"
29202919
},
29212920
"Configurations":{
29222921
"shape":"ConfigurationList",
@@ -3180,7 +3179,7 @@
31803179
},
31813180
"TimeoutAction":{
31823181
"shape":"SpotProvisioningTimeoutAction",
3183-
"documentation":"<p>The action to take when <code>TargetSpotCapacity</code> has not been fulfilled when the <code>TimeoutDurationMinutes</code> has expired. Spot instances are not uprovisioned within the Spot provisioining timeout. Valid values are <code>TERMINATE_CLUSTER</code> and <code>SWITCH_TO_ON_DEMAND</code>. SWITCH_TO_ON_DEMAND specifies that if no Spot instances are available, On-Demand Instances should be provisioned to fulfill any remaining Spot capacity.</p>"
3182+
"documentation":"<p>The action to take when <code>TargetSpotCapacity</code> has not been fulfilled when the <code>TimeoutDurationMinutes</code> has expired; that is, when all Spot instances could not be provisioned within the Spot provisioning timeout. Valid values are <code>TERMINATE_CLUSTER</code> and <code>SWITCH_TO_ON_DEMAND</code>. SWITCH_TO_ON_DEMAND specifies that if no Spot instances are available, On-Demand Instances should be provisioned to fulfill any remaining Spot capacity.</p>"
31843183
},
31853184
"BlockDurationMinutes":{
31863185
"shape":"WholeNumber",
@@ -3223,7 +3222,7 @@
32233222
},
32243223
"ActionOnFailure":{
32253224
"shape":"ActionOnFailure",
3226-
"documentation":"<p>This specifies what action to take when the cluster step fails. Possible values are TERMINATE_CLUSTER, CANCEL_AND_WAIT, and CONTINUE.</p>"
3225+
"documentation":"<p>The action to take when the cluster step fails. Possible values are TERMINATE_CLUSTER, CANCEL_AND_WAIT, and CONTINUE. TERMINATE_JOB_FLOW is provided for backward compatibility. We recommend using TERMINATE_CLUSTER instead.</p>"
32273226
},
32283227
"Status":{
32293228
"shape":"StepStatus",
@@ -3245,7 +3244,7 @@
32453244
},
32463245
"ActionOnFailure":{
32473246
"shape":"ActionOnFailure",
3248-
"documentation":"<p>The action to take if the step fails.</p>"
3247+
"documentation":"<p>The action to take when the cluster step fails. Possible values are TERMINATE_CLUSTER, CANCEL_AND_WAIT, and CONTINUE. TERMINATE_JOB_FLOW is provided for backward compatibility. We recommend using TERMINATE_CLUSTER instead.</p>"
32493248
},
32503249
"HadoopJarStep":{
32513250
"shape":"HadoopJarStepConfig",
@@ -3400,7 +3399,7 @@
34003399
},
34013400
"ActionOnFailure":{
34023401
"shape":"ActionOnFailure",
3403-
"documentation":"<p>This specifies what action to take when the cluster step fails. Possible values are TERMINATE_CLUSTER, CANCEL_AND_WAIT, and CONTINUE.</p>"
3402+
"documentation":"<p>The action to take when the cluster step fails. Possible values are TERMINATE_CLUSTER, CANCEL_AND_WAIT, and CONTINUE. TERMINATE_JOB_FLOW is available for backward compatibility. We recommend using TERMINATE_CLUSTER instead.</p>"
34043403
},
34053404
"Status":{
34063405
"shape":"StepStatus",

0 commit comments

Comments
 (0)