From 95a0ab0be58c7df67f2829a0a853fd6eaaefad5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B3=89=E9=9F=B5?= Date: Thu, 3 Dec 2020 17:16:08 +0800 Subject: [PATCH] docs fix zone_id required, docs fix --- alicloud/resource_alicloud_hbase_instance.go | 4 +- website/docs/r/hbase_instance.html.markdown | 40 ++++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/alicloud/resource_alicloud_hbase_instance.go b/alicloud/resource_alicloud_hbase_instance.go index b970902b13d7..0a5108bae84c 100644 --- a/alicloud/resource_alicloud_hbase_instance.go +++ b/alicloud/resource_alicloud_hbase_instance.go @@ -77,7 +77,7 @@ func resourceAlicloudHBaseInstance() *schema.Resource { }, "core_disk_type": { Type: schema.TypeString, - Required: true, + Optional: true, ForceNew: true, ValidateFunc: validation.StringInSlice([]string{"cloud_ssd", "cloud_efficiency", "local_hdd_pro", "local_ssd_pro", "-"}, false), }, @@ -576,7 +576,7 @@ func resourceAlicloudHBaseInstanceUpdate(d *schema.ResourceData, meta interface{ // Cumbersome operation，async call, wait for state change // wait instance status is running after modifying stateConf := BuildStateConf([]string{Hb_DISK_RESIZING}, []string{Hb_ACTIVATION}, d.Timeout(schema.TimeoutUpdate), - 1*time.Minute, hBaseService.HBaseClusterStateRefreshFunc(d.Id(), []string{Hb_DISK_RESIZE_FAILED})) + 2*time.Minute, hBaseService.HBaseClusterStateRefreshFunc(d.Id(), []string{Hb_DISK_RESIZE_FAILED})) if _, err := stateConf.WaitForState(); err != nil { return WrapError(err) } diff --git a/website/docs/r/hbase_instance.html.markdown b/website/docs/r/hbase_instance.html.markdown index 3262fa72125f..af61d358b5ec 100644 --- a/website/docs/r/hbase_instance.html.markdown +++ b/website/docs/r/hbase_instance.html.markdown @@ -9,7 +9,7 @@ description: |- # alicloud\_hbase\_instance -Provides a HBase instance resource supports replica set instances only. the HBase provides stable, reliable, and automatic scalable database services. +Provides a HBase instance resource supports replica set instances only. The HBase provides stable, reliable, and automatic scalable database services. It offers a full range of database solutions, such as disaster recovery, backup, recovery, monitoring, and alarms. You can see detail product introduction [here](https://help.aliyun.com/product/49055.html) @@ -17,7 +17,7 @@ You can see detail product introduction [here](https://help.aliyun.com/product/4 -> **NOTE:** The following regions don't support create Classic network HBase instance. [`cn-hangzhou`,`cn-shanghai`,`cn-qingdao`,`cn-beijing`,`cn-shenzhen`,`ap-southeast-1a`,.....] -the official website mark more regions. or you can call [DescribeRegions](https://help.aliyun.com/document_detail/144489.html) +The official website mark more regions. or you can call [DescribeRegions](https://help.aliyun.com/document_detail/144489.html) -> **NOTE:** Create HBase instance or change instance type and storage would cost 15 minutes. Please make full preparation @@ -47,24 +47,24 @@ this is a example for class netType instance. you can find more detail with the The following arguments are supported: * `name` - (Required) HBase instance name. Length must be 2-128 characters long. Only Chinese characters, English letters, numbers, period (.), underline (_), or dash (-) are permitted. -* `zone_id` - (Optional, ForceNew) The Zone to launch the HBase instance. if vswitch_id is not empty, this zone_id can be "" or consistent. -* `engine` - (Optional, ForceNew) "hbase/hbaseue/bds", The following types are supported after v1.73.0: `hbaseue` and `bds ` +* `zone_id` - (Optional, ForceNew) The Zone to launch the HBase instance. If vswitch_id is not empty, this zone_id can be "" or consistent. +* `engine` - (Optional, ForceNew) Valid values are "hbase/hbaseue/bds". The following types are supported after v1.73.0: `hbaseue` and `bds `. * `engine_version` - (Required, ForceNew) HBase major version. hbase:1.1/2.0, hbaseue:2.0, bds:1.0, unsupport other engine temporarily. Value options can refer to the latest docs [CreateInstance](https://help.aliyun.com/document_detail/144607.html). -* `master_instance_type`、`core_instance_type` - (Required, ForceNew) Instance specification. see [Instance specifications](https://help.aliyun.com/document_detail/53532.html). or you can call describeInstanceType api. -* `core_instance_quantity`- (Optional) Default=2. if core_instance_quantity > 1,this is cluster's instance. if core_instance_quantity = 1,this is a single instance. -* `core_disk_type`- (Required, ForceNew) Valid values are `cloud_ssd`, `cloud_efficiency`, `local_hdd_pro`, `local_ssd_pro`. local_disk size is fixed. -* `core_disk_size` - (Optional) User-defined HBase instance one core node's storage, Valid when engine=hbase/hbaseue, bds engine no need core_disk_size, space.Unit: GB. Value range: - - Custom storage space; value range: [20, 8000] - - cluster min=400GB, 40-GB increments. - - single min=20GB, 1-GB increments. -* `pay_type` - (Optional, ForceNew) Valid values are `PrePaid`, `PostPaid`,System default to `PostPaid`. -* `duration` - (Optional, ForceNew) 1, 2, 3, 4, 5, 6, 7, 8, 9, 12, 24, 36, 60, valid when pay_type = PrePaid. unit: month. -* `auto_renew` - (Optional, ForceNew) `true`, `false`, System default to `false`, valid when pay_type = PrePaid. -* `vswitch_id` - (Optional, ForceNew) If vswitch_id is not empty, that mean net_type = vpc and has a same region. if vswitch_id is empty, net_type_classic -* `cold_storage_size` - (Optional, ForceNew) 0 or 0+. 0 means is_cold_storage = false. 0+ means is_cold_storage = true -* `maintain_start_time` - (Optional, Available in 1.73.0) The start time of the operation and maintenance time period of the instance, in the format of HH:mmZ (UTC time). -* `maintain_end_time` - (Optional, Available in 1.73.0) The end time of the operation and maintenance time period of the instance, in the format of HH:mmZ (UTC time). -* `deletion_protection` - (Optional, Available in 1.73.0) The switch of delete protection. true: delete protect, false: no delete protect. you must set false when you want to delete cluster. +* `master_instance_type`, `core_instance_type` - (Required, ForceNew) Instance specification. See [Instance specifications](https://help.aliyun.com/document_detail/53532.html), or you can call describeInstanceType api. +* `core_instance_quantity`- (Optional) Default=2. If core_instance_quantity > 1, this is cluster's instance. If core_instance_quantity = 1, this is a single instance. +* `core_disk_type`- (Optional, ForceNew) Valid values are `cloud_ssd`, `cloud_efficiency`, `local_hdd_pro`, `local_ssd_pro`，`-`, local_disk size is fixed. When engine=bds, no need to set disk type. +* `core_disk_size` - (Optional) User-defined HBase instance one core node's storage. Valid when engine=hbase/hbaseue. Bds engine no need core_disk_size, space.Unit: GB. Value range: + - Custom storage space, value range: [20, 8000]. + - Cluster min=400GB, 40-GB increments. + - Single min=20GB, 1-GB increments. +* `pay_type` - (Optional, ForceNew) Valid values are `PrePaid`, `PostPaid`, System default to `PostPaid`. +* `duration` - (Optional, ForceNew) 1, 2, 3, 4, 5, 6, 7, 8, 9, 12, 24, 36, 60, valid when pay_type = PrePaid, unit: month. +* `auto_renew` - (Optional, ForceNew) Valid values are `true`, `false`, system default to `false`, valid when pay_type = PrePaid. +* `vswitch_id` - (Optional, ForceNew) If vswitch_id is not empty, that mean net_type = vpc and has a same region. If vswitch_id is empty, net_type=classic. +* `cold_storage_size` - (Optional, ForceNew) 0 or 0+. 0 means is_cold_storage = false. 0+ means is_cold_storage = true. +* `maintain_start_time` - (Optional, Available in 1.73.0) The start time of the operation and maintenance time period of the instance, in the format of HH:mmZ (UTC time), for example 02:00Z. +* `maintain_end_time` - (Optional, Available in 1.73.0) The end time of the operation and maintenance time period of the instance, in the format of HH:mmZ (UTC time), for example 04:00Z. +* `deletion_protection` - (Optional, Available in 1.73.0) The switch of delete protection. True: delete protect, False: no delete protect. You must set false when you want to delete cluster. * `tags` - (Optional, Available in 1.73.0) A mapping of tags to assign to the resource. * `account` - (Optional, Available in 1.105.0+) The account of the cluster web ui. * `password` - (Optional, Available in 1.105.0+) The password of the cluster web ui account. @@ -72,7 +72,7 @@ The following arguments are supported: * `security_groups` - (Optional, Available in 1.105.0+) The security group resource of the cluster. --> **NOTE:** now only instance name can be change. the others(instance_type, disk_size, core_instance_quantity and so on) will be supported in the furture. +-> **NOTE:** Now only instance name can be change. The others(instance_type, disk_size, core_instance_quantity and so on) will be supported in the furture. ## Attributes Reference