mirror of
git://sourceware.org/git/lvm2.git
synced 2025-01-03 05:18:29 +03:00
lvmdbusd: WS, imports, grammar
This commit is contained in:
parent
b0c7220dbb
commit
2918994873
@ -88,7 +88,6 @@ class AutomatedProperties(dbus.service.Object):
|
|||||||
cb, cbe, False)
|
cb, cbe, False)
|
||||||
cfg.worker_q.put(r)
|
cfg.worker_q.put(r)
|
||||||
|
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _get_all_prop(obj, interface_name):
|
def _get_all_prop(obj, interface_name):
|
||||||
if interface_name in obj.interface(True):
|
if interface_name in obj.interface(True):
|
||||||
|
@ -7,16 +7,13 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
import subprocess
|
|
||||||
from . import cfg
|
from . import cfg
|
||||||
from .cmdhandler import options_to_cli_args, LvmExecutionMeta, call_lvm
|
from .cmdhandler import options_to_cli_args, LvmExecutionMeta, call_lvm
|
||||||
import dbus
|
import dbus
|
||||||
from .utils import pv_range_append, pv_dest_ranges, log_error, log_debug,\
|
from .utils import pv_range_append, pv_dest_ranges, log_error, log_debug
|
||||||
mt_async_call
|
|
||||||
from .request import RequestEntry
|
from .request import RequestEntry
|
||||||
import threading
|
import threading
|
||||||
import time
|
import time
|
||||||
import traceback
|
|
||||||
|
|
||||||
|
|
||||||
def pv_move_lv_cmd(move_options, lv_full_name,
|
def pv_move_lv_cmd(move_options, lv_full_name,
|
||||||
|
@ -26,7 +26,6 @@ try:
|
|||||||
except ImportError:
|
except ImportError:
|
||||||
import json
|
import json
|
||||||
|
|
||||||
SEP = '{|}'
|
|
||||||
|
|
||||||
total_time = 0.0
|
total_time = 0.0
|
||||||
total_count = 0
|
total_count = 0
|
||||||
@ -177,7 +176,6 @@ def call_lvm(command, debug=False, line_cb=None,
|
|||||||
return -errno.EINTR, "", "operation interrupted"
|
return -errno.EINTR, "", "operation interrupted"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# The actual method which gets called to invoke the lvm command, can vary
|
# The actual method which gets called to invoke the lvm command, can vary
|
||||||
# from forking a new process to using lvm shell
|
# from forking a new process to using lvm shell
|
||||||
_t_call = call_lvm
|
_t_call = call_lvm
|
||||||
|
@ -274,15 +274,15 @@ class LvStateVdo(LvState):
|
|||||||
MetaDataPercent, CopyPercent, SyncPercent,
|
MetaDataPercent, CopyPercent, SyncPercent,
|
||||||
MetaDataSizeBytes, move_pv, move_pv_uuid,
|
MetaDataSizeBytes, move_pv, move_pv_uuid,
|
||||||
vdo_operating_mode, vdo_compression_state, vdo_index_state,
|
vdo_operating_mode, vdo_compression_state, vdo_index_state,
|
||||||
vdo_used_size,vdo_saving_percent,vdo_compression,
|
vdo_used_size, vdo_saving_percent, vdo_compression,
|
||||||
vdo_deduplication,vdo_use_metadata_hints,
|
vdo_deduplication, vdo_use_metadata_hints,
|
||||||
vdo_minimum_io_size,vdo_block_map_cache_size,
|
vdo_minimum_io_size, vdo_block_map_cache_size,
|
||||||
vdo_block_map_era_length,vdo_use_sparse_index,
|
vdo_block_map_era_length, vdo_use_sparse_index,
|
||||||
vdo_index_memory_size,vdo_slab_size,vdo_ack_threads,
|
vdo_index_memory_size, vdo_slab_size, vdo_ack_threads,
|
||||||
vdo_bio_threads,vdo_bio_rotation,vdo_cpu_threads,
|
vdo_bio_threads, vdo_bio_rotation, vdo_cpu_threads,
|
||||||
vdo_hash_zone_threads,vdo_logical_threads,
|
vdo_hash_zone_threads, vdo_logical_threads,
|
||||||
vdo_physical_threads,vdo_max_discard,
|
vdo_physical_threads, vdo_max_discard,
|
||||||
vdo_write_policy,vdo_header_size):
|
vdo_write_policy, vdo_header_size):
|
||||||
super(LvStateVdo, self).__init__(Uuid, Name, Path, SizeBytes,
|
super(LvStateVdo, self).__init__(Uuid, Name, Path, SizeBytes,
|
||||||
vg_name, vg_uuid, pool_lv_uuid, PoolLv,
|
vg_name, vg_uuid, pool_lv_uuid, PoolLv,
|
||||||
origin_uuid, OriginLv, DataPercent, Attr, Tags, active,
|
origin_uuid, OriginLv, DataPercent, Attr, Tags, active,
|
||||||
@ -595,7 +595,7 @@ class Lv(LvCommon):
|
|||||||
optional_size = space + 512 - remainder
|
optional_size = space + 512 - remainder
|
||||||
|
|
||||||
LvCommon.handle_execute(*cmdhandler.vg_lv_snapshot(
|
LvCommon.handle_execute(*cmdhandler.vg_lv_snapshot(
|
||||||
lv_name, snapshot_options,name, optional_size))
|
lv_name, snapshot_options, name, optional_size))
|
||||||
full_name = "%s/%s" % (dbo.vg_name_lookup(), name)
|
full_name = "%s/%s" % (dbo.vg_name_lookup(), name)
|
||||||
return cfg.om.get_object_path_by_lvm_id(full_name)
|
return cfg.om.get_object_path_by_lvm_id(full_name)
|
||||||
|
|
||||||
@ -635,7 +635,7 @@ class Lv(LvCommon):
|
|||||||
|
|
||||||
size_change = new_size_bytes - dbo.SizeBytes
|
size_change = new_size_bytes - dbo.SizeBytes
|
||||||
LvCommon.handle_execute(*cmdhandler.lv_resize(
|
LvCommon.handle_execute(*cmdhandler.lv_resize(
|
||||||
dbo.lvm_id, size_change,pv_dests, resize_options))
|
dbo.lvm_id, size_change, pv_dests, resize_options))
|
||||||
return "/"
|
return "/"
|
||||||
|
|
||||||
@dbus.service.method(
|
@dbus.service.method(
|
||||||
|
@ -166,7 +166,7 @@ class LVMShellProxy(object):
|
|||||||
|
|
||||||
def get_last_log(self):
|
def get_last_log(self):
|
||||||
self._write_cmd('lastlog\n')
|
self._write_cmd('lastlog\n')
|
||||||
report_json= self._read_response()[1]
|
report_json = self._read_response()[1]
|
||||||
return LVMShellProxy.get_error_msg(report_json)
|
return LVMShellProxy.get_error_msg(report_json)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
@ -58,7 +58,7 @@ class DataStore(object):
|
|||||||
c_lookup = {}
|
c_lookup = {}
|
||||||
c_pvs_in_vgs = {}
|
c_pvs_in_vgs = {}
|
||||||
|
|
||||||
# Each item item in the report is a collection of information pertaining
|
# Each item in the report is a collection of information pertaining
|
||||||
# to the vg
|
# to the vg
|
||||||
for r in _all['report']:
|
for r in _all['report']:
|
||||||
tmp_pv = []
|
tmp_pv = []
|
||||||
|
Loading…
Reference in New Issue
Block a user