Skip to content

Commit 95a0ab0

Browse files
quanyun-alixiaozhu36
authored andcommitted
docs fix zone_id required, docs fix
1 parent 141a28d commit 95a0ab0

2 files changed

Lines changed: 22 additions & 22 deletions

File tree

alicloud/resource_alicloud_hbase_instance.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func resourceAlicloudHBaseInstance() *schema.Resource {
7777
},
7878
"core_disk_type": {
7979
Type: schema.TypeString,
80-
Required: true,
80+
Optional: true,
8181
ForceNew: true,
8282
ValidateFunc: validation.StringInSlice([]string{"cloud_ssd", "cloud_efficiency", "local_hdd_pro", "local_ssd_pro", "-"}, false),
8383
},
@@ -576,7 +576,7 @@ func resourceAlicloudHBaseInstanceUpdate(d *schema.ResourceData, meta interface{
576576
// Cumbersome operation,async call, wait for state change
577577
// wait instance status is running after modifying
578578
stateConf := BuildStateConf([]string{Hb_DISK_RESIZING}, []string{Hb_ACTIVATION}, d.Timeout(schema.TimeoutUpdate),
579-
1*time.Minute, hBaseService.HBaseClusterStateRefreshFunc(d.Id(), []string{Hb_DISK_RESIZE_FAILED}))
579+
2*time.Minute, hBaseService.HBaseClusterStateRefreshFunc(d.Id(), []string{Hb_DISK_RESIZE_FAILED}))
580580
if _, err := stateConf.WaitForState(); err != nil {
581581
return WrapError(err)
582582
}

website/docs/r/hbase_instance.html.markdown

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ description: |-
99

1010
# alicloud\_hbase\_instance
1111

12-
Provides a HBase instance resource supports replica set instances only. the HBase provides stable, reliable, and automatic scalable database services.
12+
Provides a HBase instance resource supports replica set instances only. The HBase provides stable, reliable, and automatic scalable database services.
1313
It offers a full range of database solutions, such as disaster recovery, backup, recovery, monitoring, and alarms.
1414
You can see detail product introduction [here](https://help.aliyun.com/product/49055.html)
1515

1616
-> **NOTE:** Available in 1.67.0+
1717

1818
-> **NOTE:** The following regions don't support create Classic network HBase instance.
1919
[`cn-hangzhou`,`cn-shanghai`,`cn-qingdao`,`cn-beijing`,`cn-shenzhen`,`ap-southeast-1a`,.....]
20-
the official website mark more regions. or you can call [DescribeRegions](https://help.aliyun.com/document_detail/144489.html)
20+
The official website mark more regions. or you can call [DescribeRegions](https://help.aliyun.com/document_detail/144489.html)
2121

2222
-> **NOTE:** Create HBase instance or change instance type and storage would cost 15 minutes. Please make full preparation
2323

@@ -47,32 +47,32 @@ this is a example for class netType instance. you can find more detail with the
4747
The following arguments are supported:
4848

4949
* `name` - (Required) HBase instance name. Length must be 2-128 characters long. Only Chinese characters, English letters, numbers, period (.), underline (_), or dash (-) are permitted.
50-
* `zone_id` - (Optional, ForceNew) The Zone to launch the HBase instance. if vswitch_id is not empty, this zone_id can be "" or consistent.
51-
* `engine` - (Optional, ForceNew) "hbase/hbaseue/bds", The following types are supported after v1.73.0: `hbaseue` and `bds `
50+
* `zone_id` - (Optional, ForceNew) The Zone to launch the HBase instance. If vswitch_id is not empty, this zone_id can be "" or consistent.
51+
* `engine` - (Optional, ForceNew) Valid values are "hbase/hbaseue/bds". The following types are supported after v1.73.0: `hbaseue` and `bds `.
5252
* `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).
53-
* `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.
54-
* `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.
55-
* `core_disk_type`- (Required, ForceNew) Valid values are `cloud_ssd`, `cloud_efficiency`, `local_hdd_pro`, `local_ssd_pro`. local_disk size is fixed.
56-
* `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:
57-
- Custom storage space; value range: [20, 8000]
58-
- cluster min=400GB, 40-GB increments.
59-
- single min=20GB, 1-GB increments.
60-
* `pay_type` - (Optional, ForceNew) Valid values are `PrePaid`, `PostPaid`,System default to `PostPaid`.
61-
* `duration` - (Optional, ForceNew) 1, 2, 3, 4, 5, 6, 7, 8, 9, 12, 24, 36, 60, valid when pay_type = PrePaid. unit: month.
62-
* `auto_renew` - (Optional, ForceNew) `true`, `false`, System default to `false`, valid when pay_type = PrePaid.
63-
* `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
64-
* `cold_storage_size` - (Optional, ForceNew) 0 or 0+. 0 means is_cold_storage = false. 0+ means is_cold_storage = true
65-
* `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).
66-
* `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).
67-
* `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.
53+
* `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.
54+
* `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.
55+
* `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.
56+
* `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:
57+
- Custom storage space, value range: [20, 8000].
58+
- Cluster min=400GB, 40-GB increments.
59+
- Single min=20GB, 1-GB increments.
60+
* `pay_type` - (Optional, ForceNew) Valid values are `PrePaid`, `PostPaid`, System default to `PostPaid`.
61+
* `duration` - (Optional, ForceNew) 1, 2, 3, 4, 5, 6, 7, 8, 9, 12, 24, 36, 60, valid when pay_type = PrePaid, unit: month.
62+
* `auto_renew` - (Optional, ForceNew) Valid values are `true`, `false`, system default to `false`, valid when pay_type = PrePaid.
63+
* `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.
64+
* `cold_storage_size` - (Optional, ForceNew) 0 or 0+. 0 means is_cold_storage = false. 0+ means is_cold_storage = true.
65+
* `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.
66+
* `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.
67+
* `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.
6868
* `tags` - (Optional, Available in 1.73.0) A mapping of tags to assign to the resource.
6969
* `account` - (Optional, Available in 1.105.0+) The account of the cluster web ui.
7070
* `password` - (Optional, Available in 1.105.0+) The password of the cluster web ui account.
7171
* `ip_white` - (Optional, Available in 1.105.0+) The white ip list of the cluster.
7272
* `security_groups` - (Optional, Available in 1.105.0+) The security group resource of the cluster.
7373

7474

75-
-> **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.
75+
-> **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.
7676

7777
## Attributes Reference
7878

0 commit comments

Comments
 (0)