Fix issue #2441 & #2442

[DamaniN]

Pull Request Details:

• Type: Enhancement

• Impact: High

• Reference to related issue (URL):

#2441

• How was this pull request tested?

Restored system from replica cluster running Rubrik CDM v5.2

• Brief description of the changes in this pull request:

The RBS agent file name changed in Rubrik CDM v5.1. Failed over to the new file name if the old file doesn't work.

[jsmeix]

I do not use BACKUP=CDM so I cannot test anything here but
from plain looking at the code things look OK to me.

I wished there was a comment in the code
(cf. "Code must be easy to understand" in https://github.com/rear/rear/wiki/Coding-Style)
that at least mentiones the issue #2441
or even better directly tells about the source of this problem
why two file names must be tried to dowload
for example something like

# The name of the tar file that is being downloaded has changed in Rubrik CDM v5.1.
# Before Rubrik CDM v5.1 it was rubrik-agent-sunos5.10.sparc.tar.gz
# since Rubrik CDM v5.1 it is rubrik-agent-solaris.sparc.tar.gz
# cf. https://github.com/rear/rear/issues/2441

[jsmeix]

@rear/contributors
I would appreciate a second review from any other ReaR contributor.

[jsmeix]

It seems via this pull request the file
usr/share/rear/verify/CDM/default/400_verify_cdm.sh
gets deleted.
Is that intentional?

[DamaniN]

It seems via this pull request the file
usr/share/rear/verify/CDM/default/400_verify_cdm.sh
gets deleted.
Is that intentional?

Yes this is intentional. That file was causing the Rubrik agent to be started twice. The functionality was moved to another file in an earlier update but the file was never removed at that time. Starting the agent twice was contributing to #2441.

[DamaniN]

I do not use BACKUP=CDM so I cannot test anything here but
from plain looking at the code things look OK to me.

I wished there was a comment in the code
(cf. "Code must be easy to understand" in https://github.com/rear/rear/wiki/Coding-Style)
that at least mentiones the issue #2441
or even better directly tells about the source of this problem
why two file names must be tried to dowload
for example something like

# The name of the tar file that is being downloaded has changed in Rubrik CDM v5.1.
# Before Rubrik CDM v5.1 it was rubrik-agent-sunos5.10.sparc.tar.gz
# since Rubrik CDM v5.1 it is rubrik-agent-solaris.sparc.tar.gz
# cf. https://github.com/rear/rear/issues/2441

Added this note in commit 7b1e26b.

[DamaniN]

d86ca29 also fixes #2442.

[jsmeix]

I do not use BACKUP=CDM so I cannot actually test it but
from plain looking at the code things look good to me.

[jsmeix]

@DamaniN
thank you for your prompt replies and your further code enhancements.

Now things are clear to me so I approve it.

[jsmeix]

@rear/contributors
a second review from another ReaR contributor would be nice to have.
If there is none and if there are no objections I would "just merge" it tomorrow afternoon.

[schlomo]

Looks good to me. Could you please use the ReaR temp dir and rely on binaries being in $PATH.

I kindly also ask you to fix that with all the CDM-related code, if you can.

Obviously we can't test the code and rely on your testing here.

[gdha]

@DamaniN What is the reason of the removal of usr/share/rear/verify/CDM/default/400_verify_cdm.sh ?

[jsmeix]

@gdha
for the reason of the removal of usr/share/rear/verify/CDM/default/400_verify_cdm.sh
see #2445 (comment)

[jsmeix]

I tested it as far as I could without a Rubrik (CDM) cluster environment
by simulating things as far as possible with reasonable effort.
To me things look OK now.

If there are no objections I would like to merge it as is tomorrow afternoon.
We are in early ReaR 2.7 development phase so we can fix things if needed.