All of lore.kernel.org
 help / color / mirror / Atom feed
* Fixes for missing and replicated files in ceph.spec.in
@ 2014-02-21 11:27 huang jun
  2014-02-21 20:28 ` Ken Dreyer
  0 siblings, 1 reply; 6+ messages in thread
From: huang jun @ 2014-02-21 11:27 UTC (permalink / raw)
  To: ceph-devel

Signed-off-by: hjwsm1989<hjwsm1989@gmail.com>

-- 
diff --git a/ceph.spec.in b/ceph.spec.in
index 3caa849..facba6c 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -429,6 +429,7 @@ fi
@@ -429,6 +429,7 @@ fi
 %{_libdir}/rados-classes/libcls_log.so*
diff --git a/ceph.spec.in b/ceph.spec.in
index 3caa849..facba6c 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -429,6 +429,7 @@ fi
 %{_libdir}/rados-classes/libcls_replica_log.so*
 %{_libdir}/rados-classes/libcls_statelog.so*
+%{_libdir}/rados-classes/libcls_user.so*
 %{_libdir}/rados-classes/libcls_version.so*
 %dir %{_libdir}/ceph/erasure-code
 %{_libdir}/ceph/erasure-code/libec_example.so*
@@ -634,7 +635,6 @@ fi
 %{_bindir}/ceph_filestore_dump
 %{_bindir}/ceph_filestore_tool
 %{_bindir}/ceph_streamtest
-%{_bindir}/ceph_test_c_headers
 %{_bindir}/ceph_test_cfuse_cache_invalidate
 %{_bindir}/ceph_test_cls_hello
 %{_bindir}/ceph_test_cls_lock
@@ -654,7 +654,6 @@ fi
 %{_bindir}/ceph_test_filestore_idempotent
 %{_bindir}/ceph_test_filestore_idempotent_sequence
 %{_bindir}/ceph_test_objectstore_workloadgen
-%{_bindir}/ceph_test_get_blkdev_size
 %{_bindir}/ceph_test_ioctls
 %{_bindir}/ceph_test_keyvaluedb_atomicity
 %{_bindir}/ceph_test_keyvaluedb_iterators
@@ -690,6 +689,7 @@ fi
 %{_bindir}/ceph_test_rados_list_parallel
 %{_bindir}/ceph_test_rados_open_pools_parallel
 %{_bindir}/ceph_test_rados_watch_notify
+%{_bindir}/ceph_test_rgw_manifest
 %{_bindir}/ceph_test_signal_handlers
 %{_bindir}/ceph_test_snap_mapper

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: Fixes for missing and replicated files in ceph.spec.in
  2014-02-21 11:27 Fixes for missing and replicated files in ceph.spec.in huang jun
@ 2014-02-21 20:28 ` Ken Dreyer
  2014-02-21 20:48   ` Sage Weil
  0 siblings, 1 reply; 6+ messages in thread
From: Ken Dreyer @ 2014-02-21 20:28 UTC (permalink / raw)
  To: huang jun; +Cc: ceph-devel

On Fri, Feb 21, 2014 at 4:27 AM, huang jun <hjwsm1989@gmail.com> wrote:
> Signed-off-by: hjwsm1989<hjwsm1989@gmail.com>
>
> --
> diff --git a/ceph.spec.in b/ceph.spec.in
> index 3caa849..facba6c 100644
> --- a/ceph.spec.in
> +++ b/ceph.spec.in
> @@ -429,6 +429,7 @@ fi
> @@ -429,6 +429,7 @@ fi
>  %{_libdir}/rados-classes/libcls_log.so*
> diff --git a/ceph.spec.in b/ceph.spec.in
> index 3caa849..facba6c 100644
> --- a/ceph.spec.in
> +++ b/ceph.spec.in
> @@ -429,6 +429,7 @@ fi
>  %{_libdir}/rados-classes/libcls_replica_log.so*
>  %{_libdir}/rados-classes/libcls_statelog.so*
> +%{_libdir}/rados-classes/libcls_user.so*

Thanks for catching this.


> @@ -690,6 +689,7 @@ fi
>  %{_bindir}/ceph_test_rados_list_parallel
>  %{_bindir}/ceph_test_rados_open_pools_parallel
>  %{_bindir}/ceph_test_rados_watch_notify
> +%{_bindir}/ceph_test_rgw_manifest
>  %{_bindir}/ceph_test_signal_handlers
>  %{_bindir}/ceph_test_snap_mapper


It seems like we have to deal with this sort of thing over and over.
Anyone have objections to simply using a wildcard to capture all the
test files? Something like %{_bindir}/ceph_test_* ?

- Ken

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: Fixes for missing and replicated files in ceph.spec.in
  2014-02-21 20:28 ` Ken Dreyer
@ 2014-02-21 20:48   ` Sage Weil
  2014-02-21 23:04     ` Ken Dreyer
  0 siblings, 1 reply; 6+ messages in thread
From: Sage Weil @ 2014-02-21 20:48 UTC (permalink / raw)
  To: Ken Dreyer; +Cc: huang jun, ceph-devel

On Fri, 21 Feb 2014, Ken Dreyer wrote:
> On Fri, Feb 21, 2014 at 4:27 AM, huang jun <hjwsm1989@gmail.com> wrote:
> > Signed-off-by: hjwsm1989<hjwsm1989@gmail.com>
> >
> > --
> > diff --git a/ceph.spec.in b/ceph.spec.in
> > index 3caa849..facba6c 100644
> > --- a/ceph.spec.in
> > +++ b/ceph.spec.in
> > @@ -429,6 +429,7 @@ fi
> > @@ -429,6 +429,7 @@ fi
> >  %{_libdir}/rados-classes/libcls_log.so*
> > diff --git a/ceph.spec.in b/ceph.spec.in
> > index 3caa849..facba6c 100644
> > --- a/ceph.spec.in
> > +++ b/ceph.spec.in
> > @@ -429,6 +429,7 @@ fi
> >  %{_libdir}/rados-classes/libcls_replica_log.so*
> >  %{_libdir}/rados-classes/libcls_statelog.so*
> > +%{_libdir}/rados-classes/libcls_user.so*
> 
> Thanks for catching this.
> 
> 
> > @@ -690,6 +689,7 @@ fi
> >  %{_bindir}/ceph_test_rados_list_parallel
> >  %{_bindir}/ceph_test_rados_open_pools_parallel
> >  %{_bindir}/ceph_test_rados_watch_notify
> > +%{_bindir}/ceph_test_rgw_manifest
> >  %{_bindir}/ceph_test_signal_handlers
> >  %{_bindir}/ceph_test_snap_mapper
> 
> 
> It seems like we have to deal with this sort of thing over and over.
> Anyone have objections to simply using a wildcard to capture all the
> test files? Something like %{_bindir}/ceph_test_* ?

Sounds good to me.  This is only stuff that 'make install' is putting in 
place right?

sage

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: Fixes for missing and replicated files in ceph.spec.in
  2014-02-21 20:48   ` Sage Weil
@ 2014-02-21 23:04     ` Ken Dreyer
  2014-02-22  4:25       ` huang jun
  0 siblings, 1 reply; 6+ messages in thread
From: Ken Dreyer @ 2014-02-21 23:04 UTC (permalink / raw)
  To: Sage Weil; +Cc: huang jun, ceph-devel

On Fri, Feb 21, 2014 at 1:48 PM, Sage Weil <sage@inktank.com> wrote:
> On Fri, 21 Feb 2014, Ken Dreyer wrote:
>> On Fri, Feb 21, 2014 at 4:27 AM, huang jun <hjwsm1989@gmail.com> wrote:
>> > @@ -690,6 +689,7 @@ fi
>> >  %{_bindir}/ceph_test_rados_list_parallel
>> >  %{_bindir}/ceph_test_rados_open_pools_parallel
>> >  %{_bindir}/ceph_test_rados_watch_notify
>> > +%{_bindir}/ceph_test_rgw_manifest
>> >  %{_bindir}/ceph_test_signal_handlers
>> >  %{_bindir}/ceph_test_snap_mapper
>>
>>
>> It seems like we have to deal with this sort of thing over and over.
>> Anyone have objections to simply using a wildcard to capture all the
>> test files? Something like %{_bindir}/ceph_test_* ?
>
> Sounds good to me.  This is only stuff that 'make install' is putting in
> place right?

Yep, that's right, the wildcard will just match what 'make install' has done.

Pull request is at https://github.com/ceph/ceph/pull/1287 . Huang, if
you have time, it would be great to get your review before we merge.

- Ken

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: Fixes for missing and replicated files in ceph.spec.in
  2014-02-21 23:04     ` Ken Dreyer
@ 2014-02-22  4:25       ` huang jun
  2014-03-05  3:32         ` Ken Dreyer
  0 siblings, 1 reply; 6+ messages in thread
From: huang jun @ 2014-02-22  4:25 UTC (permalink / raw)
  To: Ken Dreyer; +Cc: Sage Weil, ceph-devel

we can also use test_* instead of listing all test_xx  files while
building debian package

diff --git a/debian/ceph-test.install b/debian/ceph-test.install
index bdcb75f..ac79055 100644
--- a/debian/ceph-test.install
+++ b/debian/ceph-test.install
@@ -19,63 +19,7 @@ usr/bin/ceph_smalliobenchdumb
 usr/bin/ceph_smalliobenchfs
 usr/bin/ceph_smalliobenchrbd
 usr/bin/ceph_streamtest
-usr/bin/ceph_test_cfuse_cache_invalidate
-usr/bin/ceph_test_cls_hello
-usr/bin/ceph_test_cls_lock
-usr/bin/ceph_test_cls_log
-usr/bin/ceph_test_cls_rbd
-usr/bin/ceph_test_cls_refcount
-usr/bin/ceph_test_cls_replica_log
-usr/bin/ceph_test_cls_rgw
-usr/bin/ceph_test_cls_rgw_log
-usr/bin/ceph_test_cls_rgw_meta
-usr/bin/ceph_test_cls_rgw_opstate
-usr/bin/ceph_test_cls_statelog
-usr/bin/ceph_test_cls_version
-usr/bin/ceph_test_cors
-usr/bin/ceph_test_crypto
-usr/bin/ceph_test_filejournal
-usr/bin/ceph_test_objectstore
-usr/bin/ceph_test_filestore_idempotent
-usr/bin/ceph_test_filestore_idempotent_sequence
-usr/bin/ceph_test_objectstore_workloadgen
-usr/bin/ceph_test_ioctls
-usr/bin/ceph_test_keys
-usr/bin/ceph_test_keyvaluedb_atomicity
-usr/bin/ceph_test_keyvaluedb_iterators
-usr/bin/ceph_test_libcephfs
-usr/bin/ceph_test_librbd
-usr/bin/ceph_test_librbd_fsx
-usr/bin/ceph_test_mon_workloadgen
-usr/bin/ceph_test_msgr
-usr/bin/ceph_test_mutate
-usr/bin/ceph_test_object_map
-usr/bin/ceph_test_objectcacher_stress
-usr/bin/ceph_test_rados
-usr/bin/ceph_test_rados_api_aio
-usr/bin/ceph_test_rados_api_cls
-usr/bin/ceph_test_rados_api_c_read_operations
-usr/bin/ceph_test_rados_api_c_write_operations
-usr/bin/ceph_test_rados_api_cmd
-usr/bin/ceph_test_rados_api_io
-usr/bin/ceph_test_rados_api_list
-usr/bin/ceph_test_rados_api_lock
-usr/bin/ceph_test_rados_api_misc
-usr/bin/ceph_test_rados_api_tier
-usr/bin/ceph_test_rados_api_pool
-usr/bin/ceph_test_rados_api_snapshots
-usr/bin/ceph_test_rados_api_stat
-usr/bin/ceph_test_rados_api_watch_notify
-usr/bin/ceph_test_rados_delete_pools_parallel
-usr/bin/ceph_test_rados_list_parallel
-usr/bin/ceph_test_rados_open_pools_parallel
-usr/bin/ceph_test_rados_watch_notify
-usr/bin/ceph_test_rewrite_latency
-usr/bin/ceph_test_signal_handlers
-usr/bin/ceph_test_snap_mapper
-usr/bin/ceph_test_stress_watch
-usr/bin/ceph_test_timers
-usr/bin/ceph_test_trans
+usr/bin/ceph_test_*
 usr/bin/ceph_tpbench
 usr/bin/ceph_xattr_bench
 usr/bin/ceph-monstore-tool

2014-02-22 7:04 GMT+08:00 Ken Dreyer <ken.dreyer@inktank.com>:
> On Fri, Feb 21, 2014 at 1:48 PM, Sage Weil <sage@inktank.com> wrote:
>> On Fri, 21 Feb 2014, Ken Dreyer wrote:
>>> On Fri, Feb 21, 2014 at 4:27 AM, huang jun <hjwsm1989@gmail.com> wrote:
>>> > @@ -690,6 +689,7 @@ fi
>>> >  %{_bindir}/ceph_test_rados_list_parallel
>>> >  %{_bindir}/ceph_test_rados_open_pools_parallel
>>> >  %{_bindir}/ceph_test_rados_watch_notify
>>> > +%{_bindir}/ceph_test_rgw_manifest
>>> >  %{_bindir}/ceph_test_signal_handlers
>>> >  %{_bindir}/ceph_test_snap_mapper
>>>
>>>
>>> It seems like we have to deal with this sort of thing over and over.
>>> Anyone have objections to simply using a wildcard to capture all the
>>> test files? Something like %{_bindir}/ceph_test_* ?
>>
>> Sounds good to me.  This is only stuff that 'make install' is putting in
>> place right?
>
> Yep, that's right, the wildcard will just match what 'make install' has done.
>
> Pull request is at https://github.com/ceph/ceph/pull/1287 . Huang, if
> you have time, it would be great to get your review before we merge.
>
> - Ken



-- 
thanks
huangjun

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: Fixes for missing and replicated files in ceph.spec.in
  2014-02-22  4:25       ` huang jun
@ 2014-03-05  3:32         ` Ken Dreyer
  0 siblings, 0 replies; 6+ messages in thread
From: Ken Dreyer @ 2014-03-05  3:32 UTC (permalink / raw)
  To: huang jun; +Cc: Sage Weil, ceph-devel

On Fri, Feb 21, 2014 at 9:25 PM, huang jun <hjwsm1989@gmail.com> wrote:
> we can also use test_* instead of listing all test_xx  files while
> building debian package

This works in my basic testing. Pull request submitted here:
https://github.com/ceph/ceph/pull/1371

- Ken

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-03-05  3:32 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-21 11:27 Fixes for missing and replicated files in ceph.spec.in huang jun
2014-02-21 20:28 ` Ken Dreyer
2014-02-21 20:48   ` Sage Weil
2014-02-21 23:04     ` Ken Dreyer
2014-02-22  4:25       ` huang jun
2014-03-05  3:32         ` Ken Dreyer

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.