diff --git a/bigtable/google/cloud/bigtable_admin_v2/gapic/bigtable_instance_admin_client_config.py b/bigtable/google/cloud/bigtable_admin_v2/gapic/bigtable_instance_admin_client_config.py index 5b738628f32f..9107ed551462 100644 --- a/bigtable/google/cloud/bigtable_admin_v2/gapic/bigtable_instance_admin_client_config.py +++ b/bigtable/google/cloud/bigtable_admin_v2/gapic/bigtable_instance_admin_client_config.py @@ -23,12 +23,12 @@ "retry_params_name": "default" }, "GetInstance": { - "timeout_millis": 60000, + "timeout_millis": 120000, "retry_codes_name": "idempotent", "retry_params_name": "default" }, "ListInstances": { - "timeout_millis": 60000, + "timeout_millis": 120000, "retry_codes_name": "idempotent", "retry_params_name": "default" }, @@ -43,8 +43,8 @@ "retry_params_name": "default" }, "DeleteInstance": { - "timeout_millis": 60000, - "retry_codes_name": "idempotent", + "timeout_millis": 150000, + "retry_codes_name": "non_idempotent", "retry_params_name": "default" }, "CreateCluster": { @@ -53,12 +53,12 @@ "retry_params_name": "default" }, "GetCluster": { - "timeout_millis": 60000, + "timeout_millis": 120000, "retry_codes_name": "idempotent", "retry_params_name": "default" }, "ListClusters": { - "timeout_millis": 60000, + "timeout_millis": 120000, "retry_codes_name": "idempotent", "retry_params_name": "default" }, @@ -68,47 +68,47 @@ "retry_params_name": "default" }, "DeleteCluster": { - "timeout_millis": 60000, - "retry_codes_name": "idempotent", + "timeout_millis": 120000, + "retry_codes_name": "non_idempotent", "retry_params_name": "default" }, "CreateAppProfile": { - "timeout_millis": 60000, + "timeout_millis": 120000, "retry_codes_name": "non_idempotent", "retry_params_name": "default" }, "GetAppProfile": { - "timeout_millis": 60000, + "timeout_millis": 120000, "retry_codes_name": "idempotent", "retry_params_name": "default" }, "ListAppProfiles": { - "timeout_millis": 60000, + "timeout_millis": 120000, "retry_codes_name": "idempotent", "retry_params_name": "default" }, "UpdateAppProfile": { - "timeout_millis": 60000, + "timeout_millis": 120000, "retry_codes_name": "idempotent", "retry_params_name": "default" }, "DeleteAppProfile": { - "timeout_millis": 60000, + "timeout_millis": 120000, "retry_codes_name": "non_idempotent", "retry_params_name": "default" }, "GetIamPolicy": { - "timeout_millis": 60000, + "timeout_millis": 120000, "retry_codes_name": "idempotent", "retry_params_name": "default" }, "SetIamPolicy": { - "timeout_millis": 60000, + "timeout_millis": 120000, "retry_codes_name": "non_idempotent", "retry_params_name": "default" }, "TestIamPermissions": { - "timeout_millis": 60000, + "timeout_millis": 120000, "retry_codes_name": "idempotent", "retry_params_name": "default" } diff --git a/bigtable/google/cloud/bigtable_admin_v2/gapic/bigtable_table_admin_client_config.py b/bigtable/google/cloud/bigtable_admin_v2/gapic/bigtable_table_admin_client_config.py index 61d5fcc95194..895c81a25c78 100644 --- a/bigtable/google/cloud/bigtable_admin_v2/gapic/bigtable_table_admin_client_config.py +++ b/bigtable/google/cloud/bigtable_admin_v2/gapic/bigtable_table_admin_client_config.py @@ -14,31 +14,13 @@ "rpc_timeout_multiplier": 1.0, "max_rpc_timeout_millis": 20000, "total_timeout_millis": 600000 - }, - "create_table": { - "initial_retry_delay_millis": 100, - "retry_delay_multiplier": 1.3, - "max_retry_delay_millis": 60000, - "initial_rpc_timeout_millis": 130000, - "rpc_timeout_multiplier": 1.0, - "max_rpc_timeout_millis": 130000, - "total_timeout_millis": 3600000 - }, - "drop_row_range": { - "initial_retry_delay_millis": 100, - "retry_delay_multiplier": 1.3, - "max_retry_delay_millis": 60000, - "initial_rpc_timeout_millis": 900000, - "rpc_timeout_multiplier": 1.0, - "max_rpc_timeout_millis": 900000, - "total_timeout_millis": 3600000 } }, "methods": { "CreateTable": { - "timeout_millis": 130000, + "timeout_millis": 900000, "retry_codes_name": "non_idempotent", - "retry_params_name": "create_table" + "retry_params_name": "default" }, "CreateTableFromSnapshot": { "timeout_millis": 60000, @@ -46,29 +28,29 @@ "retry_params_name": "default" }, "ListTables": { - "timeout_millis": 60000, + "timeout_millis": 120000, "retry_codes_name": "idempotent", "retry_params_name": "default" }, "GetTable": { - "timeout_millis": 60000, + "timeout_millis": 120000, "retry_codes_name": "idempotent", "retry_params_name": "default" }, "DeleteTable": { - "timeout_millis": 60000, - "retry_codes_name": "idempotent", + "timeout_millis": 120000, + "retry_codes_name": "non_idempotent", "retry_params_name": "default" }, "ModifyColumnFamilies": { - "timeout_millis": 60000, + "timeout_millis": 900000, "retry_codes_name": "non_idempotent", "retry_params_name": "default" }, "DropRowRange": { "timeout_millis": 900000, "retry_codes_name": "non_idempotent", - "retry_params_name": "drop_row_range" + "retry_params_name": "default" }, "GenerateConsistencyToken": { "timeout_millis": 60000, diff --git a/bigtable/google/cloud/bigtable_admin_v2/gapic/enums.py b/bigtable/google/cloud/bigtable_admin_v2/gapic/enums.py index 6081506d671a..ac1e2d44e8bf 100644 --- a/bigtable/google/cloud/bigtable_admin_v2/gapic/enums.py +++ b/bigtable/google/cloud/bigtable_admin_v2/gapic/enums.py @@ -32,6 +32,71 @@ class StorageType(enum.IntEnum): HDD = 2 +class Instance(object): + class State(enum.IntEnum): + """ + Possible states of an instance. + + Attributes: + STATE_NOT_KNOWN (int): The state of the instance could not be determined. + READY (int): The instance has been successfully created and can serve requests + to its tables. + CREATING (int): The instance is currently being created, and may be destroyed + if the creation process encounters an error. + """ + STATE_NOT_KNOWN = 0 + READY = 1 + CREATING = 2 + + class Type(enum.IntEnum): + """ + The type of the instance. + + Attributes: + TYPE_UNSPECIFIED (int): The type of the instance is unspecified. If set when creating an + instance, a ``PRODUCTION`` instance will be created. If set when updating + an instance, the type will be left unchanged. + PRODUCTION (int): An instance meant for production use. ``serve_nodes`` must be set + on the cluster. + DEVELOPMENT (int): The instance is meant for development and testing purposes only; it has + no performance or uptime guarantees and is not covered by SLA. + After a development instance is created, it can be upgraded by + updating the instance to type ``PRODUCTION``. An instance created + as a production instance cannot be changed to a development instance. + When creating a development instance, ``serve_nodes`` on the cluster must + not be set. + """ + TYPE_UNSPECIFIED = 0 + PRODUCTION = 1 + DEVELOPMENT = 2 + + +class Cluster(object): + class State(enum.IntEnum): + """ + Possible states of a cluster. + + Attributes: + STATE_NOT_KNOWN (int): The state of the cluster could not be determined. + READY (int): The cluster has been successfully created and is ready to serve requests. + CREATING (int): The cluster is currently being created, and may be destroyed + if the creation process encounters an error. + A cluster may not be able to serve requests while being created. + RESIZING (int): The cluster is currently being resized, and may revert to its previous + node count if the process encounters an error. + A cluster is still capable of serving requests while being resized, + but may exhibit performance as if its number of allocated nodes is + between the starting and requested states. + DISABLED (int): The cluster has no backing nodes. The data (tables) still + exist, but no operations can be performed on the cluster. + """ + STATE_NOT_KNOWN = 0 + READY = 1 + CREATING = 2 + RESIZING = 3 + DISABLED = 4 + + class Table(object): class TimestampGranularity(enum.IntEnum): """ @@ -104,68 +169,3 @@ class State(enum.IntEnum): STATE_NOT_KNOWN = 0 READY = 1 CREATING = 2 - - -class Instance(object): - class State(enum.IntEnum): - """ - Possible states of an instance. - - Attributes: - STATE_NOT_KNOWN (int): The state of the instance could not be determined. - READY (int): The instance has been successfully created and can serve requests - to its tables. - CREATING (int): The instance is currently being created, and may be destroyed - if the creation process encounters an error. - """ - STATE_NOT_KNOWN = 0 - READY = 1 - CREATING = 2 - - class Type(enum.IntEnum): - """ - The type of the instance. - - Attributes: - TYPE_UNSPECIFIED (int): The type of the instance is unspecified. If set when creating an - instance, a ``PRODUCTION`` instance will be created. If set when updating - an instance, the type will be left unchanged. - PRODUCTION (int): An instance meant for production use. ``serve_nodes`` must be set - on the cluster. - DEVELOPMENT (int): The instance is meant for development and testing purposes only; it has - no performance or uptime guarantees and is not covered by SLA. - After a development instance is created, it can be upgraded by - updating the instance to type ``PRODUCTION``. An instance created - as a production instance cannot be changed to a development instance. - When creating a development instance, ``serve_nodes`` on the cluster must - not be set. - """ - TYPE_UNSPECIFIED = 0 - PRODUCTION = 1 - DEVELOPMENT = 2 - - -class Cluster(object): - class State(enum.IntEnum): - """ - Possible states of a cluster. - - Attributes: - STATE_NOT_KNOWN (int): The state of the cluster could not be determined. - READY (int): The cluster has been successfully created and is ready to serve requests. - CREATING (int): The cluster is currently being created, and may be destroyed - if the creation process encounters an error. - A cluster may not be able to serve requests while being created. - RESIZING (int): The cluster is currently being resized, and may revert to its previous - node count if the process encounters an error. - A cluster is still capable of serving requests while being resized, - but may exhibit performance as if its number of allocated nodes is - between the starting and requested states. - DISABLED (int): The cluster has no backing nodes. The data (tables) still - exist, but no operations can be performed on the cluster. - """ - STATE_NOT_KNOWN = 0 - READY = 1 - CREATING = 2 - RESIZING = 3 - DISABLED = 4