diff --git a/README.md b/README.md index 7a4a4af..d8ab788 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ +Cetune - A Ceph deplyment, benchmarking, tuning, profiling tool developed by Intel -#### Functionality Description +#### Description - CeTune is a toolkit/framework to deploy, benchmark, profile and tune *Ceph cluster performance. - Aim to speed up the procedure of benchmarking *Ceph performance, and provide clear data charts of system metrics, latency breakdown data for users to analyze *Ceph performance. - CeTune provides test performance through three interfaces: block, file system and object to evaluate *Ceph. diff --git a/analyzer/analyzer.py b/analyzer/analyzer.py index 52b601f..0b119c0 100644 --- a/analyzer/analyzer.py +++ b/analyzer/analyzer.py @@ -142,7 +142,7 @@ def process_data(self, use_tmp): all_node = [] for node in self.cluster["osds"] + self.cluster["client"]: - common.printout("LOG","note "+ node + " start analysis") + common.printout("LOG","node "+ node + " start analysis") common.scp(self.cluster["user"],node,remote_file,self.cluster["tmp_dir"]) common.scp(self.cluster["user"],node,remote_file1,self.cluster["tmp_dir"]) common.scp(self.cluster["user"],node,remote_file2,self.cluster["tmp_dir"]) @@ -158,7 +158,7 @@ def process_data(self, use_tmp): p.start() all_node.append((p,node)) - common.printout("LOG","waiting for all note finish analysis") + common.printout("LOG","waiting for all nodes to finish analysis") log_line = {} while(1): for proc,node in all_node: @@ -174,7 +174,7 @@ def process_data(self, use_tmp): break time.sleep(1) - common.printout("LOG","all note finish analysis") + common.printout("LOG","all nodes finish analysis") common.printout("LOG","Merging node process.") for dir_name in self.cluster["osds"] + self.cluster["client"]: system_file = os.path.join(self.workpath,dir_name+"-system.json") diff --git a/benchmarking/mod/benchmark.py b/benchmarking/mod/benchmark.py index 410779e..c5a2087 100644 --- a/benchmarking/mod/benchmark.py +++ b/benchmarking/mod/benchmark.py @@ -163,6 +163,11 @@ def run(self): #send command to ceph cluster common.pdsh(user, nodes, "for i in `seq 1 %d`;do echo `date \"+%s\"` `ceph health` >> %s/`hostname`_ceph_health.txt; sleep %s;done" % (time_tmp/int(monitor_interval)+1, "%Y_%m_%d %H:%M:%S", dest_dir, monitor_interval), option="force") + common.pdsh(user, nodes, "cat /proc/cpuinfo > %s/`hostname`_HWINFO_CPU.txt" % (dest_dir)) + common.pdsh(user, nodes, "free -m > %s/`hostname`_HWINFO_meomory.txt" % (dest_dir)) + common.pdsh(user, nodes, "ifconfig > %s/`hostname`_HWINFO_NIC.txt" % (dest_dir)) + common.pdsh(user, nodes, "ip link show > %s/`hostname`_HWINFO_iplink.txt" % (dest_dir)) + common.pdsh(user, nodes, "fdisk -l > %s/`hostname`_HWINFO_fdisk.txt" % (dest_dir)) common.pdsh(user, nodes, "ps aux | grep ceph-osd | grep -v 'grep' > %s/`hostname`_ps.txt" % (dest_dir)) common.pdsh(user, nodes, "date > %s/`hostname`_process_log.txt" % (dest_dir)) common.printout("LOG","Start system data collector under %s " % nodes) @@ -172,6 +177,7 @@ def run(self): common.pdsh(user, nodes, "iostat -p ALL -dxm %s > %s/`hostname`_iostat.txt & echo `date +%s`' iostat start' >> %s/`hostname`_process_log.txt" % (monitor_interval, dest_dir, '%s', dest_dir)) common.pdsh(user, nodes, "sar -A %s > %s/`hostname`_sar.txt & echo `date +%s`' sar start' >> %s/`hostname`_process_log.txt" % (monitor_interval, dest_dir, '%s', dest_dir)) common.pdsh(user, nodes, "ceph -v > %s/`hostname`_ceph_version.txt" % (dest_dir)) + common.pdsh(user, nodes, "ceph osd tree > %s/`hostname`_ceph_osdtree.txt" % (dest_dir)) if "perfcounter" in self.cluster["collector"]: common.printout("LOG","Start perfcounter data collector under %s " % nodes) self.create_admin_daemon_dump_script(dest_dir, time_tmp, monitor_interval) diff --git a/doc/release-notes.rst b/doc/release-notes.rst new file mode 100644 index 0000000..dfe0f01 --- /dev/null +++ b/doc/release-notes.rst @@ -0,0 +1,14 @@ + +============= +Release Notes +============= + +v1.0 + +This is the first stable release of CeTune. + +Major feature +----------------------- +-*Deploy*: + +