(t) legacy binary path in some scripts #2470

FroggyFlox · 2023-01-18T16:48:20Z

On an RPM-installed Rockstor 4.5.4-0, we see the following error when trying to run the debug-mode script:

$ poetry run debug-mode ON
Traceback (most recent call last):
  File "<string>", line 1, in <module>
  File "/opt/rockstor/src/rockstor/scripts/debugmode.py", line 64, in main
    run_command([SUPERCTL_BIN, "restart", "gunicorn"])
  File "/opt/rockstor/src/rockstor/system/osi.py", line 217, in run_command
    raise Exception("Exception while running command({}): {}".format(cmd, e))
Exception: Exception while running command(['/opt/rockstor/bin/supervisorctl', 'restart', 'gunicorn']): [Errno 2] No such file or directory

This is due to the following now-erroneous path defined:

rockstor-core/src/rockstor/scripts/debugmode.py

Line 32 in 28292f5

SUPERCTL_BIN = path.join(settings.ROOT_DIR, "bin/supervisorctl")

This should be using our poetry venv instead.
[phillxnet: EDIT] instances found to date summarised:

rockstor-core/src/rockstor/scripts/debugmode.py

Line 32 in ccd21f7

SUPERCTL_BIN = path.join(settings.ROOT_DIR, "bin/supervisorctl")
rockstor-core/src/rockstor/smart_manager/views/docker_service.py

Line 142 in eeb0084

docker_wrapper = "{}bin/docker-wrapper".format(settings.ROOT_DIR)
rockstor-core/src/rockstor/smart_manager/views/replication.py

Line 55 in ccd21f7

"%s root %sbin/send-replica %d\n"
rockstor-core/src/rockstor/smart_manager/views/task_scheduler.py

Line 104 in 28292f5

tab = "%s %sbin/st-snapshot %d" % (
rockstor-core/src/rockstor/smart_manager/views/task_scheduler.py

Line 110 in 28292f5

tab = "%s %s/bin/st-pool-scrub %d" % (
rockstor-core/src/rockstor/smart_manager/views/task_scheduler.py

Line 116 in 28292f5

tab = "%s %s/bin/st-system-power %d" % (
rockstor-core/src/rockstor/storageadmin/views/oauth_app.py

Line 87 in 28292f5

"{}bin/delete-api-key command. If you do delete it, "
rockstor-core/src/rockstor/storageadmin/templates/storageadmin/login.html

Line 141 in 28292f5

/opt/rockstor/bin/pwreset<br/><br/>

The text was updated successfully, but these errors were encountered:

FroggyFlox · 2023-01-18T20:01:53Z

Another instance:

rockstor-core/src/rockstor/smart_manager/views/docker_service.py

Line 142 in eeb0084

docker_wrapper = "{}bin/docker-wrapper".format(settings.ROOT_DIR)

This is legacy code now, though, and should not be affected by the Poetry move.

FroggyFlox · 2023-01-18T20:02:42Z

rockstor-core/src/rockstor/smart_manager/views/replication.py

Line 56 in eeb0084

% (replica.crontab, settings.ROOT_DIR, replica.id)

This one should be corrected

FroggyFlox · 2023-01-18T20:05:48Z

rockstor-core/src/rockstor/smart_manager/views/task_scheduler.py

Line 104 in 28292f5

tab = "%s %sbin/st-snapshot %d" % (

rockstor-core/src/rockstor/smart_manager/views/task_scheduler.py

Line 110 in 28292f5

tab = "%s %s/bin/st-pool-scrub %d" % (

rockstor-core/src/rockstor/smart_manager/views/task_scheduler.py

Line 116 in 28292f5

tab = "%s %s/bin/st-system-power %d" % (

... should be corrected.

FroggyFlox · 2023-01-18T20:07:27Z

rockstor-core/src/rockstor/storageadmin/views/oauth_app.py

Line 87 in 28292f5

"{}bin/delete-api-key command. If you do delete it, "

... should be corrected.

FroggyFlox · 2023-01-18T20:10:14Z

rockstor-core/src/rockstor/storageadmin/templates/storageadmin/login.html

Line 141 in 28292f5

/opt/rockstor/bin/pwreset<br/><br/>

... should be corrected.

phillxnet · 2023-01-19T10:55:06Z

All @FroggyFlox found legacy bin paths have now been addressed in my working branch against this issue.
Just having a quick look for stragglers.

phillxnet · 2023-01-19T11:28:22Z

We also have the following comments on running subsets of our tests:

Extracted form "

src/rockstor/fs/tests/test_btrfs.py: ./bin/test --settings=test-settings -v 3 -p test_btrfs*
...
src/rockstor/system/tests/test_osi.py: ./bin/test --settings=test-settings -v 3 -p test_osi*
src/rockstor/system/tests/test_pkg_mgmt.py: ./bin/test --settings=test-settings -v 3 -p test_pkg_mgmt*
src/rockstor/system/tests/test_pkg_mgmt.py: # '/usr/bin/zypper', '--non-interactive', '-q', 'list-updates']
src/rockstor/system/tests/test_directory_services.py: ./bin/test --settings=test-settings -v 3 -p test_directory_services*
src/rockstor/system/tests/test_directory_services.py: cmd=["/usr/bin/net", "ads", "workgroup", "-S", domain],
src/rockstor/system/tests/test_system_network.py: ./bin/test --settings=test-settings -v 3 -p test_system_network*
...

src/rockstor/storageadmin/tests/test_appliances.py: # bin/django dumpdata storageadmin.appliance --natural-foreign --indent 4 >
src/rockstor/storageadmin/tests/test_appliances.py: # ./bin/test -v 2 -p test_appliances.py
src/rockstor/storageadmin/tests/test_disk_smart.py: # bin/django dumpdata storageadmin.disk storageadmin.smartcapability
src/rockstor/storageadmin/tests/test_disk_smart.py: # ./bin/test -v 2 -p test_disk_smart.py
src/rockstor/storageadmin/tests/test_disks.py: "Error running a command. cmd = /sbin/btrfs fi show "
src/rockstor/storageadmin/tests/test_pool_balance.py:bin/django dumpdata storageadmin.pool storageadmin.disk storageadmin.poolbalance
src/rockstor/storageadmin/tests/test_pool_balance.py:./bin/test -v 2 -p test_pool_balance.py
src/rockstor/storageadmin/tests/test_pool_balance_huey.py:bin/django dumpdata storageadmin.pool storageadmin.disk storageadmin.poolbalance
src/rockstor/storageadmin/tests/test_pool_balance_huey.py:./bin/test -v 2 -p test_pool_balance.py
src/rockstor/storageadmin/tests/test_pool_scrub.py:bin/django dumpdata storageadmin.pool --natural-foreign --indent 4 >
src/rockstor/storageadmin/tests/test_pool_scrub.py:./bin/test -v 2 -p test_pool_scrub.py
src/rockstor/storageadmin/tests/test_pools.py:bin/django dumpdata storageadmin.pool storageadmin.disk storageadmin.share
src/rockstor/storageadmin/tests/test_pools.py:./bin/test -v 2 -p test_pools.py
src/rockstor/storageadmin/tests/test_samba.py: # bin/django dumpdata storageadmin.pool storageadmin.share
src/rockstor/storageadmin/tests/test_samba.py: # ./bin/test -v 2 -p test_samba.py
src/rockstor/storageadmin/tests/test_shares.py:bin/django dumpdata storageadmin.pool storageadmin.share storageadmin.snapshot
src/rockstor/storageadmin/tests/test_shares.py:bin/django dumpdata --database smart_manager smart_manager.service
src/rockstor/storageadmin/tests/test_shares.py:./bin/test -v 2 -p test_shares.py
src/rockstor/storageadmin/tests/test_snapshot.py:bin/django dumpdata storageadmin.pool storageadmin.share storageadmin.snapshot
src/rockstor/storageadmin/tests/test_snapshot.py:./bin/test -v 2 -p test_snapshot.py
src/rockstor/storageadmin/tests/test_api.py: # bin/django dumpdata --natural-foreign --indent 4 auth.user > src/rockstor/storageadmin/fixtures/test_api.json
src/rockstor/storageadmin/tests/test_user.py: # 'shell': '/bin/xyz', 'email': '[email protected]'}
src/rockstor/storageadmin/tests/test_network.py: # ./bin/test -v 2 -p test_network.py
..

src/rockstor/smart_manager/tests/test_task_scheduler.py: # bin/django dumpdata auth.user storageadmin.pool storageadmin.share
src/rockstor/smart_manager/tests/test_task_scheduler.py: # ./bin/test -v 2 -p test_task_scheduler.py
..

We have also a shell definition here:

src/rockstor/settings.py:VALID_SHELLS = ('{}/bin/rcli'.format(BASE_DIR), '/bin/bash', '/sbin/nologin',)
but from:

rockstor-core/pyproject.toml

Lines 129 to 132 in ccd21f7

    
           # Legacy scripts 
        
           # rcli = 'cli.rock_cli:main' 
        
           # docker-wrapper = 'scripts.docker_wrapper:main' 
        
           # rockon-json = 'scripts.rockon_util:main'

'rcli' is one of our currently legacy entry-points.

This file is thought to be redundant but should be removed under it's own issue to prove this claim.

etc/init.d/gunicorn:DAEMON=/opt/rockstor/bin/gunicorn

phillxnet · 2023-01-19T11:43:21Z

A follow up issue has now been created and linked back to this one concerning the many comment changes required within our test. As these also require other modifications given we no longer maintain a test-settings.py

phillxnet · 2023-01-19T11:49:11Z

I have included, by way of establishing an in-code reference for the future, a fix for the following single test subset instructional comment:

rockstor-core/src/rockstor/fs/tests/test_btrfs.py

Line 53 in ccd21f7

./bin/test --settings=test-settings -v 3 -p test_btrfs*

Replace all currently identified, previously missed, live legacy binary paths. Thanks to FroggyFlox on GitHub for greatly assisting with these changes. Affects: - debugmode selection script - docker wrapper functions - replication - task scheduling ## Includes - an example of a change required to our various test comments concerning a similar change required that will be addressed in a follow-up patch (test_btrfs.py) - user facing text changes pertaining to related path changes: (login.html, oauth_app.py)

…n_some_scripts (t) legacy binary path in some scripts/functions #2470

phillxnet · 2023-01-19T17:33:36Z

Closing as:
Fixed by #2476

Thanks again to @FroggyFlox for much of the ground work on this one.

phillxnet added this to the First Stable Poetry build milestone Jan 18, 2023

FroggyFlox self-assigned this Jan 18, 2023

FroggyFlox added a commit to FroggyFlox/rockstor-core that referenced this issue Jan 18, 2023

Fix bin dir for supervisorctl in debugmode.py rockstor#2470

437f8d6

phillxnet changed the title ~~(t) hard-coded path to binary in some script(s)~~ (t) legacy binary path in some scripts Jan 19, 2023

phillxnet self-assigned this Jan 19, 2023

phillxnet mentioned this issue Jan 19, 2023

correct testing comments re invocation and fixture preperation #2475

Open

phillxnet mentioned this issue Jan 19, 2023

(t) legacy binary path in some scripts/functions #2470 #2476

Merged

phillxnet added a commit that referenced this issue Jan 19, 2023

Merge pull request #2476 from phillxnet/2470_(t)_legacy_binary_path_i…

c175f0a

…n_some_scripts (t) legacy binary path in some scripts/functions #2470

phillxnet closed this as completed Jan 19, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(t) legacy binary path in some scripts #2470

(t) legacy binary path in some scripts #2470

FroggyFlox commented Jan 18, 2023 •

edited by phillxnet

Loading

FroggyFlox commented Jan 18, 2023

FroggyFlox commented Jan 18, 2023

FroggyFlox commented Jan 18, 2023

FroggyFlox commented Jan 18, 2023

FroggyFlox commented Jan 18, 2023

phillxnet commented Jan 19, 2023

phillxnet commented Jan 19, 2023 •

edited

Loading

phillxnet commented Jan 19, 2023

phillxnet commented Jan 19, 2023 •

edited

Loading

phillxnet commented Jan 19, 2023

(t) legacy binary path in some scripts #2470

(t) legacy binary path in some scripts #2470

Comments

FroggyFlox commented Jan 18, 2023 • edited by phillxnet Loading

FroggyFlox commented Jan 18, 2023

FroggyFlox commented Jan 18, 2023

FroggyFlox commented Jan 18, 2023

FroggyFlox commented Jan 18, 2023

FroggyFlox commented Jan 18, 2023

phillxnet commented Jan 19, 2023

phillxnet commented Jan 19, 2023 • edited Loading

phillxnet commented Jan 19, 2023

phillxnet commented Jan 19, 2023 • edited Loading

phillxnet commented Jan 19, 2023

FroggyFlox commented Jan 18, 2023 •

edited by phillxnet

Loading

phillxnet commented Jan 19, 2023 •

edited

Loading

phillxnet commented Jan 19, 2023 •

edited

Loading