Skip to content

Commit

Permalink
Doc: various: update some COMPAT comments
Browse files Browse the repository at this point in the history
  • Loading branch information
kgaillot committed Jul 29, 2024
1 parent 624bf99 commit ad47002
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 14 deletions.
2 changes: 2 additions & 0 deletions daemons/based/pacemaker-based.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ setup_stand_alone(GError **error)

/* @COMPAT Deprecated since 2.1.8. Use pcmk_list_cluster_options() or
* crm_attribute --list-options=cluster instead of querying daemon metadata.
*
* NOTE: pcs (as of at least 0.11.8) uses this
*/
static int
based_metadata(pcmk__output_t *out)
Expand Down
2 changes: 2 additions & 0 deletions daemons/controld/pacemaker-controld.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ static pcmk__supported_format_t formats[] = {

/* @COMPAT Deprecated since 2.1.8. Use pcmk_list_cluster_options() or
* crm_attribute --list-options=cluster instead of querying daemon metadata.
*
* NOTE: pcs (as of at least 0.11.8) uses this
*/
static int
controld_metadata(pcmk__output_t *out)
Expand Down
2 changes: 2 additions & 0 deletions daemons/fenced/pacemaker-fenced.c
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,8 @@ st_peer_update_callback(enum pcmk__node_update type, pcmk__node_status_t *node,

/* @COMPAT Deprecated since 2.1.8. Use pcmk_list_fence_attrs() or
* crm_resource --list-options=fencing instead of querying daemon metadata.
*
* NOTE: pcs (as of at least 0.11.8) uses this
*/
static int
fencer_metadata(void)
Expand Down
2 changes: 2 additions & 0 deletions daemons/schedulerd/pacemaker-schedulerd.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ void pengine_shutdown(int nsig);

/* @COMPAT Deprecated since 2.1.8. Use pcmk_list_cluster_options() or
* crm_attribute --list-options=cluster instead of querying daemon metadata.
*
* NOTE: pcs (as of at least 0.11.8) uses this
*/
static int
scheduler_metadata(pcmk__output_t *out)
Expand Down
5 changes: 1 addition & 4 deletions include/crm/cluster/internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,8 @@
extern "C" {
#endif

// @TODO Replace this with a pcmk__node_status_flags value
enum crm_proc_flag {
/* @COMPAT When pcmk__node_status_t:processes is made internal, we can merge
* this into node flags or turn it into a boolean. Until then, in theory
* something could depend on these particular numeric values.
*/
crm_proc_none = 0x00000001,

// Cluster layers
Expand Down
13 changes: 3 additions & 10 deletions tools/crm_mon.c
Original file line number Diff line number Diff line change
Expand Up @@ -722,16 +722,9 @@ static GOptionEntry display_entries[] = {
};

static GOptionEntry deprecated_entries[] = {
/* @COMPAT At least the following resource agents use --as-xml at time of
* writing:
* * galera
* * pgsql
* * rabbitmq-cluster
* * redis
*
* Removing this option must wait until those are updated and we no longer
* support building on any platforms that ship the older agents in stock
* packages.
/* @COMPAT resource-agents <4.15.0 uses --as-xml, so removing this option
* must wait until we no longer support building on any platforms that ship
* the older agents.
*/
{ "as-xml", 'X', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, as_xml_cb,
"Write cluster status as XML to stdout. This will enable one-shot mode.\n"
Expand Down

0 comments on commit ad47002

Please sign in to comment.