ceph-disk broken????

Commit Message

Willem Jan Withagen May 6, 2016, 7:34 a.m. UTC

On 6-5-2016 06:49, kefu chai wrote:
> On Thu, May 5, 2016 at 4:44 AM, Willem Jan Withagen <[e-mail]> wrote:
>> Hi
>>
>> Setup:
>>   Fresh VM with CentOS7
>>   standard ceph/ceph clone
>>   building with run-make-check.sh
>>      So the dependancies are installed by install-deps.sh
>>
>> I have several tests that fail with:
>>
>>  run_osd:  ceph-disk --statedir=testdir/osd-crush
>> --sysconfdir=testdir/osd-crush --prepend-to-path= prepare
>> testdir/osd-crush/0
>> Traceback (most recent call last):
>>   File "/tmp/ceph-disk-virtualenv/bin/ceph-disk", line 5, in <module>
>>     from pkg_resources import load_entry_point
>>   File
>> "/tmp/ceph-disk-virtualenv/lib/python2.7/site-packages/pkg_resources.py",
>> line 3007, in <module>
>>     working_set.require(__requires__)
>>   File
>> "/tmp/ceph-disk-virtualenv/lib/python2.7/site-packages/pkg_resources.py",
>> line 728, in require
>>     needed = self.resolve(parse_requirements(requirements))
>>   File
>> "/tmp/ceph-disk-virtualenv/lib/python2.7/site-packages/pkg_resources.py",
>> line 626, in resolve
>>     raise DistributionNotFound(req)
>> pkg_resources.DistributionNotFound: ceph-disk==1.0.0
>>
>> Looks like ceph-disk is not in the fresh install in tmp...
>>
>> Ran into this with my development fork, but then also with a regular HEAD
>> Did I miss something?
>
> Willem, you are not missing anything. the problem you are facing is what
> happens in our jenkins sometimes. for example, see
> https://jenkins.ceph.com/job/ceph-pull-requests/5222/consoleFull . Loïc tried
> to root cause this, and found that it only happens in rhel7.0.

And FreeBSD... :(
Could this be a PATH issue... I do remember adding a /usr/local/bin/ 
path to
ceph-disk.sh to get it to find python in the FreeBSD tree.

--WjW

; test_activate_dir ) || return 1
  }

  function run_timeout() {
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/src/ceph-disk/tests/ceph-disk.sh 
b/src/ceph-disk/tests/ceph-disk.sh
index 60280c6..b1c4391 100755
--- a/src/ceph-disk/tests/ceph-disk.sh
+++ b/src/ceph-disk/tests/ceph-disk.sh
@@ -69,7 +69,7 @@  CEPH_DISK_ARGS+=" --statedir=$DIR"
  CEPH_DISK_ARGS+=" --sysconfdir=$DIR"
  CEPH_DISK_ARGS+=" --prepend-to-path="
  CEPH_DISK_ARGS+=" --verbose"
-TIMEOUT=120
+TIMEOUT=300

  cat=$(which cat)
  timeout=$(which timeout)
@@ -201,7 +201,7 @@  function test_path() {
  }

  function test_no_path() {
-    ( export 
PATH=../ceph-detect-init/virtualenv/bin:virtualenv/bin:..:/usr/bin:/bin 
; test_activate_dir ) || return 1
+    ( export 
PATH=../ceph-detect-init/virtualenv/bin:virtualenv/bin:..:/usr/bin:/bin:/usr/local/bin