Merge pull request #117 from SUSE/wip-autoconf-exception

build/ops: rpm: adapt License line to Release 2.0 of SPDX spec

build/ops: rpm: adapt License line to Release 2.0 of SPDX spec

Signed-off-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #115 from SUSE/wip-12-0-3-alt

Merge upstream v12.0.3 plus https://github.com/ceph/ceph/pull/14997

ceph.spec.in, debian/control: build/runtime dependency for cherrypy

Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit bd6f2d9210d0220fa83f65421173a369e8403847)

Conflicts:
ceph.spec.in (trivial resolution)

build/ops: rpm: no rgw Beast frontend on s390x

Since the Beast frontend uses boost::context which is not supported on
s390x.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 84e80b74cf6320d50eea879131a34482f597c366)

build/ops: rpm: reverse s390 bcond conditional block

I'm not a fan of "if NOT x - then - else" blocks.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit d97ab7643992003581d85f9c66f5b742b04c3c76)

cmake: build boost::context only if rgw Beast frontend is in use

boost::context is currently (1.63) unsupported for s390x and anyway
it makes sense to conditionalize Boost components so they are only
built with the Ceph components that need them (like is already being
done for mgr).

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Tim Serong <tserong@suse.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 7fe63057d6197871ff52b3ccced5e831c5fa6fef)

cmake: fix boost components for WITH_SYSTEM_BOOST

when using WITH_SYSTEM_BOOST dont set header-only packages
for BOOST_COMPONENTS. On some distros these packages dont
exist.

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
(cherry picked from commit 23b073237e6e321f7deaba65a810b187a84be0a0)
(cherry picked from commit f807387aed9d55c8de0ea4f56e0ffefe343f0dac)

rpm: drop %{epoch} from new rados-objclass-devel subpackage

Introduced in b7215b025ae

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit c9169a7ce7d923c89a73418a9ea8a2f2e9e33361)

cmake: added empty RPATH to libcls_sdk.so

Signed-off-by: Nathan Cutler <ncutler@suse.com>

build/ops: rpm: move python-prettytable to distro-conditional section

The correct package name in SUSE is python-PrettyTable

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 08bc5e6528c9090ee90652b3d9746c64dc41dff7)

Conflicts:
ceph.spec.in (no python-CherryPy downstream, yet)

build/ops: rpm: move RDMA build dependency to distro-conditional section

SUSE ships this package under the name "rdma-core-devel". See
https://build.opensuse.org/package/view_file/openSUSE:Factory/rdma-core/rdma-core.spec?expand=1

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit ba641b5160e3863e342b379c46eb0a0827b6c628)

build/ops: rpm: make librbd1 %post scriptlet depend on coreutils

Fixes: http://tracker.ceph.com/issues/20052
Signed-off-by: Giacomo Comes <comes@naic.edu>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 88ac9daaf183bbecef721a737c3743f377156ff8)

Conflicts:
ceph.spec.in (trivial resolution)

Merge remote-tracking branch 'ivancich/wip-bring-in-dmclock-p2' into wip-12-0-3-alt

Make change so dmclock tests are not built unless WITH_TESTS and
WITH_DMCLOCK_TESTS are both set. This is so openSUSE Leap will build
correctly.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>

Merge tag 'v12.0.3' into wip-12-0-3-alt

v12.0.3

Conflicts:
ceph.spec.in
src/test/librados/c_write_operations.cc

Modify cmake files to take advantage or re-organization of dmclock's
cmake set-up, specifically not allowing dmclock to call add_test.
Remove dmclock tests from being dependencies on ceph's "test" target.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>

Merge commit '5b02d98da5e92c961d52faa6bbfeb440a5e64625' into HEAD

Squashed 'src/dmclock/' changes from d6586d7..a26d29e

a26d29e Modify cmake files to match naming of cmake's upstream gtest and ceph's boost.
e23e63f Reorganize CMakeLists.txt files, so that projects that incorporate dmclock can control whether add_test is called. Now, add_test is called only at the top-level. Projects that incorporate dmclock can use add_subdirectory on subdirectories beneath the top-level to selective exactly what is included.

git-subtree-dir: src/dmclock
git-subtree-split: a26d29ef46ef8fbd5512a1f36637af7d3099c307

osd/PG: Add two new mClock implementations of the PG sharded operator queue

Create an mClock priority queue, which can in turn be used for two new
implementations of the PG shards operator queue. The first
(mClockOpClassQueue) prioritizes operations based on which class they
belong to (recovery, scrub, snaptrim, client op, osd subop). The
second (mClockClientQueue) also incorporates the client identifier, in
order to promote fairness between clients.

In addition, also remove OpQueue's remove_by_filter and all possible
associated subclass implementations and tests.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>

12.0.3

Merge pull request #15094 from fullerdj/wip-djf-19893

qa/cephfs: Fix for test_data_scan

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14938 from michaelsevilla/f19362

mds: add perf counters for file system operations

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #15018 from ukernel/wip-19890

pybind: fix open flags calculation

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14769 from ukernel/wip-19755

osdc/Filer: truncate large file party by party

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #15052 from batrick/i19734

mds: use debug_mds for most subsys

Reviewed-by: John Spray <john.spray@redhat.com>

qa/cephfs: Fix for test_data_scan

Don't assume that test_data_scan will be run on exactly 2 MDS nodes.

Fixes: http://tracker.ceph.com/issues/19893
Signed-off-by: Douglas Fuller <dfuller@redhat.com>

Merge pull request #15091 from ceph/luminous

merge v12.0.2 release tag

mds: add perf counters for file system operations

Shows the types of operations that clients are doing by adding counters to the
spot where the MDS responds to clients. This avoids counting operations that
were restarted while waiting for locks or for metadata to load.  Does not
support per-client activity. This is the first step towards comprehensive
performance tracking in the file system.

Signed-off-by: Michael Sevilla <mikesevilla3@gmail.com>

Merge pull request #15079 from ztczll/master

mailmap: ztczll affiliation

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #15081 from tchaikov/wip-fio-readme

fio: update README.md so only the fio ceph engine is built

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #15048 from trociny/wip-19907

rbd-mirror: resolve admin socket path names collision

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #15026 from ukernel/wip-19891

qa/suites/fs: reserve more space for mds in full tests

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #15039 from ukernel/wip-19903

client: fix UserPerm::gid_in_group()

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #15035 from batrick/quiet-mds-grow-shrink

qa: silence spurious insufficient standby health warnings

Reviewed-by: Yan, Zheng <zyan@redhat.com>

Merge pull request #14991 from ukernel/wip-19828

mds: fix use-after-free in Locker::file_update_finish()

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14978 from cernceph/dvanders_quota

client: client_quota no longer optional

Reviewed-by: John Spray <john.spray@redhat.com>

fio: update README.md so only the fio ceph engine is built

Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge pull request #15044 from lixiaoy1/master

test/fio_ceph_objectstore: fix fio plugin build failure by engine_data

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

mailmap:ztczll affiliation

Signed-off-by: zhanglei <243290414@qq.com>

Merge pull request #15076 from atheism/atheism-mailmap

mailmap: Weibing Zhang mailmap affiliation

Merge pull request #15007 from ztczll/master

test/objectstore/: Check put_ref return value

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>

Merge pull request #15021 from runsisi/wip-fix-writefull

osd/PrimayLogPG: update modified range to include the whole object size for write_full op

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #15046 from ukernel/wip-osdmap-encode

osd/OSDMap: bump encoding version for require_min_compat_client

Reviewed-by: Sage Weil <sage@redhat.com>

mailmap: Weibing Zhang mailmap affiliation

Signed-off-by: Weibing Zhang <atheism.zhang@gmail.com>

rbd-mirror: resolve admin socket path names collision

If global admin_socket parameter is set, for PoolReplayer admin
sockets generate and use unique paths in $run_dir. Provide the socket
paths in output of PoolReplayer's "rbd mirror status" admin socket
command.

A possible use case:

1) run "rbd mirror status $pool_replayer" command using global admin
   socket (known from configuration) and obtain socket paths for the
   PoolReplayer local and remote context sockets.
2) Use these paths to run commands provides by the contexts.

Fixes: http://tracker.ceph.com/issues/19907
Signed-off-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #13111 from cbodley/wip-rgw-mdlog-trim

rgw multisite: automated mdlog trimming

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #15004 from liewegas/wip-19880

os/bluestore: fix deferred write race

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>

Merge pull request #15029 from xiexingguo/wip-bluestore-20170510

os/bluestore: pre-calculate number of ghost buffers to evict

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #15012 from tchaikov/wip-byteswap

byteorder: use gcc intrinsics for byteswap

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #15019 from badone/wip-redundant-headers-2

common: Remove redundant includes

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #15040 from tchaikov/wip-19902

osd/PrimaryLogPG: do not call on_shutdown() if (pg.deleting)

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #15009 from tchaikov/wip-kill-warnings

libradosstriper: do not assign garbage to returned value

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>

Merge pull request #14940 from ceph/wip-radosgw-admin-package-move

debian/rpm: move radosgw-admin to ceph-common

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

test/common: Check block_device_model return value

Signed-off-by: zhanglei <243290414@qq.com>

pybind: fix cephfs.OSError initialization

Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "cephfs.pyx", line 672, in cephfs.LibCephFS.open (/home/zhyan/Ceph/ceph-2/build/src/pybind/cephfs/pyrex/cephfs.c:10160)
  File "cephfs.pyx", line 155, in cephfs.OSError.__init__ (/home/zhyan/Ceph/ceph-2/build/src/pybind/cephfs/pyrex/cephfs.c:1889)
TypeError: __init__() takes exactly 3 positional arguments (2 given)

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>

Merge pull request #13610 from liewegas/wip-snapset

osd: eliminate snapdir objects and move clone snaps vector into SnapSet

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #15056 from liewegas/wip-fix-osdmap-comment

osd/OSDMap: fix feature commit comment

osd/OSDMap: fix feature commit comment

Signed-off-by: Sage Weil <sage@redhat.com>

Merge pull request #10260 from weiqiaomiao/wqm-wip-clean-opstate

rgw: clean unuse code in cls_statelog_check_state

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #14411 from mikulely/rgw-cleanup-rados

rgw: rgw_rados drop deprecated global var

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #14906 from mikulely/lc-cleanup-2

rgw: cleanup lc continuation

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>

Merge pull request #15010 from shashalu/fix-bucket-create

rgw: when create_bucket use the same num_shards with info.num_shards

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #15017 from dillaman/wip-19863

common/bit_vector: utilize deep-copy during data decode

Reviewed-by: Sage Weil <sage@redhat.com>

mds: use debug_mds for most subsys

DOUT_COND was obsoleted by f41887e38d70970f4d0181fb73e835ece68cee6c.

Balancer and Mantle use a dout hack to continue working since we will probably
specifically want very verbose balancer output in the future.

Fixes: http://tracker.ceph.com/issues/19734
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

test/fio_ceph_objectstore: fix fio plugin build failure by engine_data

The commit in fio https://github.com/axboe/fio/commit/710bf9c592b849935e1bcc56ffc805fa1d5f9365
changed engine_data to a union which leads build of fio_ceph_objectstore failed.

Signed-off-by: Lisa Li xiaoyan.li@intel.com

osd/PrimayLogPG: update modified range to include the whole object size for write_full op

Signed-off-by: runsisi <runsisi@zte.com.cn>

osd/PrimaryLogPG: drop parameter count_bytes for write_update_size_and_usage

Signed-off-by: runsisi <runsisi@zte.com.cn>

osd/OSDMap: bump encoding version for require_min_compat_client

Otherwise, OSDMap::decode() throws expcetion when decoding old
version osdmap

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>

tests: add teuthology yaml for SLE-12-SP3

Signed-off-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #14743 from ukernel/wip-19635

mds: issue new caps when sending reply to client

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14704 from batrick/i19589

mds: fix mantle script to not fail for last rank

Reviewed-by: Michael Sevilla <mikesevilla3@gmail.com>

mds: fix use-after-free in Locker::file_update_finish()

The capability may have already been freed when executing
Locker::file_update_finish()

Fixes: http://tracker.ceph.com/issues/19828
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>

Merge pull request #14921 from batrick/ptrwaiter-balance

mds: relocate PTRWAITER put near get

osd/PrimaryLogPG: do not call on_shutdown() if (pg.deleting)

when a callback is called, it could be facing a PG already shut down by
OSD. but if that callback wants to shut that PG down. it should check
the PG's status first.

Fixes: http://tracker.ceph.com/issues/19902
Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge pull request #14598 from batrick/mds-balancer-pin

mds: support export pinning on directories

client: fix UserPerm::gid_in_group()

Fixes: http://tracker.ceph.com/issues/19903
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>

qa/suites/fs: fix write size calculation in full tests

'max_avail' has already taken full_ratio into account

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>

common: Remove redundant includes

Fixes: http://tracker.ceph.com/issues/19883 (Partially)
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>

mds: delay export until dir is stable

This catches an assertion failure due to exports on unjournaled directories:

    2017-05-10 12:45:18.193640 7eff65a04700  7 mds.0.migrator export_dir [dir 10000000003 /a/ [2,head] auth pv=3 v=1 cv=0/0 ap=1+2+2 state=1073742082|complete f()->f(v0 m2017-05-10 12:45:14.977151 1=0+1) n()->n(v0 rc2017-05-10 12:45:14.977151 1=0+1) hs=0+1,ss=0+0 | child=1 authpin=1 0x55ef655de000] to 1
    2017-05-10 12:45:18.193654 7eff65a04700 15 mds.0.18 hit export target 10 @ 2017-05-10 12:45:18.193653
    2017-05-10 12:45:18.193661 7eff65a04700 10 mds.0.cache.dir(10000000003) auth_pin by 0x55ef650cc130 on [dir 10000000003 /a/ [2,head] auth pv=3 v=1 cv=0/0 ap=2+2+2 state=1073742082|complete f()->f(v0 m2017-05-10 12:45:14.977151 1=0+1) n()->n(v0 rc2017-05-10 12:45:14.977151 1=0+1) hs=0+1,ss=0+0 | child=1 authpin=1 0x55ef655de000] count now 2 + 2
    2017-05-10 12:45:18.193701 7eff65a04700  7 mds.0.cache request_start_internal request(mds.0:4) op 5377
    2017-05-10 12:45:18.193708 7eff65a04700  7 mds.0.migrator dispatch_export_dir request(mds.0:4)
    2017-05-10 12:45:18.198281 7eff66205700 20 mgrc operator() 234 counters, of which 0 new
    2017-05-10 12:45:18.198294 7eff66205700 20 mgrc send_report encoded 2006 bytes
    2017-05-10 12:45:18.198298 7eff66205700  1 -- 127.0.0.1:6825/693985647 --> 127.0.0.1:6826/1025 -- mgrreport(+0-0 packed 2006) v2 -- 0x55ef655abe00 con 0
    2017-05-10 12:45:18.198364 7eff6a9ab700 10 _calc_signature seq 14 front_crc_ = 2388339344 middle_crc = 0 data_crc = 0 sig = 5026349537430007662
    2017-05-10 12:45:18.198376 7eff6a9ab700 20 Putting signature in client message(seq # 14): sig = 5026349537430007662
    2017-05-10 12:45:18.198411 7eff65a04700 -1 /home/pdonnell/ceph/src/mds/MDCache.cc: In function 'void MDCache::make_trace(std::vector<CDentry*>&, CInode*)' thread 7eff65a04700 time 2017-05-10 12:45:18.194136
    /home/pdonnell/ceph/src/mds/MDCache.cc: 8225: FAILED assert(parent)

     ceph version 12.0.1-2198-ge757c02 (e757c025fa3270b12fb2fca17cf159fa1bd72747)
     1: (ceph::__ceph_assert_fail(char const*, char const*, int, char const*)+0x102) [0x55ef5b780f02]
     2: (MDCache::make_trace(std::vector<CDentry*, std::allocator<CDentry*> >&, CInode*)+0x1cb) [0x55ef5b4fa12b]
     3: (Migrator::get_export_lock_set(CDir*, std::set<SimpleLock*, std::less<SimpleLock*>, std::allocator<SimpleLock*> >&)+0x55) [0x55ef5b5e8215]
     4: (Migrator::dispatch_export_dir(boost::intrusive_ptr<MDRequestImpl>&, int)+0xa74) [0x55ef5b5f72d4]
     5: (Migrator::export_dir(CDir*, int)+0x9ca) [0x55ef5b5ea75a]
     6: (MDBalancer::handle_export_pins()+0x7b4) [0x55ef5b61ab24]
     7: (MDBalancer::tick()+0x1e8) [0x55ef5b61b748]
     8: (MDSRankDispatcher::tick()+0x5f1) [0x55ef5b44bdb1]
     9: (Context::complete(int)+0x9) [0x55ef5b43bcc9]
     10: (SafeTimer::timer_thread()+0x452) [0x55ef5b77dd52]
     11: (SafeTimerThread::entry()+0xd) [0x55ef5b77f15d]
     12: (()+0x76ba) [0x7eff6d4bb6ba]
     13: (clone()+0x6d) [0x7eff6c52782d]

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

byteorder: refactor ceph_le{16,32,64} using template

to improve the readablity and easier for debugging.

Signed-off-by: Kefu Chai <kchai@redhat.com>

byteorder: use gcc intrinsics for byteswap

* use gcc intrinsics for byteswap
* use template to wrap them.
* add the modeline for emacs/vim
* update the caller of the mswab/swab accordingly

Signed-off-by: Kefu Chai <kchai@redhat.com>

radosstriper: do not use GCC extension to initialize struct members

it's obsolete since GCC 2.5 and is not portable. see
https://gcc.gnu.org/onlinedocs/gcc/Designated-Inits.html

Signed-off-by: Kefu Chai <kchai@redhat.com>

byteorder: remove the cruft to detect endianness

Signed-off-by: Kefu Chai <kchai@redhat.com>

common/sctp_crc32: include acconfig.h for the detecting endianness

so byteorder.h can be a pure c++ header.

Signed-off-by: Kefu Chai <kchai@redhat.com>

cmake: use cmake module to detect endianness

Signed-off-by: Kefu Chai <kchai@redhat.com>

qa: add health warning test for insufficient standbys

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

qa: turn off spurious standby health warning

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #15030 from chardan/jfw-wip-halflife_atomic_t-fix-compare_exchange_weak

tools: change compare_exchange_weak to compare_exchange_strong

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #14975 from runsisi/wip-io-logging

librbd: cleanup logging code under librbd/io

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #14905 from johnzzpcrystal/aio

test/fsx:  Remove the dead code associated with aio backend

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #14911 from ovh/bp-small-enc-eradication

os/bluestore: use denc for varint encoding

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #14957 from ovh/bp-crc-cache-miss-counter

buffer, osd: add missing crc cache miss perf counter

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #14996 from xiexingguo/wip-fix-dump_basic

mon/PGMap.cc: fix "osd_epochs" section of dump_basic

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #15003 from badone/wip-redundant-headers

common: Remove redundant includes

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #15013 from TsaiJin/wip-pg-lock-cleanup

osd/PG.cc: unify the call of checking whether lock is held

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #14937 from SpandanKumarSahu/bug#17453

mgr: remove non-existent MDS daemons from FSMap

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

librbd: cleanup logging code under librbd/io

Signed-off-by: runsisi <runsisi@zte.com.cn>

tools: change compare_exchange_weak to compare_exchange_strong

On non x86 platforms without a dedicated compare-exchange instruction, std::compare_exchange_weak()
could fail.

Signed-off-by: Jesse Williamson <jwilliamson@suse.de>

os/bluestore: pre-calculate number of ghost buffers to evict

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>